From ed87bf68202aaf80a48535366c49a5b8dec6cf9f Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Wed, 17 Dec 2014 13:17:29 -0600
Subject: [PATCH 001/120] MAGETWO-31732: Blacklisted ComposerTest
- restored the test for CE
---
.../Magento/Test/Integrity/ComposerTest.php | 418 ++++++++++++++++++
.../Framework/Composer/MagentoComponent.php | 28 ++
2 files changed, 446 insertions(+)
create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
create mode 100644 lib/internal/Magento/Framework/Composer/MagentoComponent.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
new file mode 100644
index 00000000000..f79d5aaae07
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -0,0 +1,418 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Test\Integrity;
+
+use Magento\Framework\Composer\MagentoComponent;
+use Magento\Framework\Test\Utility\Files;
+use Magento\Framework\Shell;
+use Magento\Framework\Exception;
+
+/**
+ * A test that enforces validity of composer.json files and any other conventions in Magento components
+ */
+class ComposerTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Framework\Shell
+ */
+ private static $shell;
+
+ /**
+ * @var bool
+ */
+ private static $isComposerAvailable;
+
+ /**
+ * @var string
+ */
+ private static $root;
+
+ /**
+ * @var \stdClass
+ */
+ private static $rootJson;
+
+ /**
+ * @var array
+ */
+ private static $dependencies;
+
+ /**
+ * @var string
+ */
+ private static $composerPath = 'composer';
+
+ public static function setUpBeforeClass()
+ {
+ if (defined('TESTS_COMPOSER_PATH')) {
+ self::$composerPath = TESTS_COMPOSER_PATH;
+ }
+ self::$shell = self::createShell();
+ self::$isComposerAvailable = self::isComposerAvailable();
+ self::$root = Files::init()->getPathToSource();
+ self::$rootJson = json_decode(file_get_contents(self::$root . '/composer.json'), true);
+ self::$dependencies = [];
+ }
+
+ public function testValidComposerJson()
+ {
+ $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+ $invoker(
+ /**
+ * @param string $dir
+ * @param string $packageType
+ */
+ function ($dir, $packageType) {
+ $this->assertComposerAvailable();
+ $file = $dir . '/composer.json';
+ $this->assertFileExists($file);
+ self::$shell->execute(self::$composerPath . ' validate --working-dir=%s', [$dir]);
+ $contents = file_get_contents($file);
+ $json = json_decode($contents);
+ $this->assertCodingStyle($contents);
+ $this->assertMagentoConventions($dir, $packageType, $json);
+ },
+ $this->validateComposerJsonDataProvider()
+ );
+ }
+
+ /**
+ * @return array
+ */
+ public function validateComposerJsonDataProvider()
+ {
+ $root = \Magento\Framework\Test\Utility\Files::init()->getPathToSource();
+ $result = [];
+ foreach (glob("{$root}/app/code/Magento/*", GLOB_ONLYDIR) as $dir) {
+ $result[$dir] = [$dir, 'magento2-module'];
+ }
+ foreach (glob("{$root}/app/i18n/magento/*", GLOB_ONLYDIR) as $dir) {
+ $result[$dir] = [$dir, 'magento2-language'];
+ }
+ foreach (glob("{$root}/app/design/adminhtml/Magento/*", GLOB_ONLYDIR) as $dir) {
+ $result[$dir] = [$dir, 'magento2-theme'];
+ }
+ foreach (glob("{$root}/app/design/frontend/Magento/*", GLOB_ONLYDIR) as $dir) {
+ $result[$dir] = [$dir, 'magento2-theme'];
+ }
+ foreach (glob("{$root}/lib/internal/Magento/*", GLOB_ONLYDIR) as $dir) {
+ $result[$dir] = [$dir, 'magento2-library'];
+ }
+ $result[$root] = [$root, 'project'];
+
+ return $result;
+ }
+
+ /**
+ * Some of coding style conventions
+ *
+ * @param string $contents
+ */
+ private function assertCodingStyle($contents)
+ {
+ $this->assertNotRegExp('/" :\s*["{]/', $contents, 'Coding style: no space before colon.');
+ $this->assertNotRegExp('/":["{]/', $contents, 'Coding style: a space is necessary after colon.');
+ }
+
+ /**
+ * Enforce Magento-specific conventions to a composer.json file
+ *
+ * @param string $dir
+ * @param string $packageType
+ * @param \StdClass $json
+ * @throws \InvalidArgumentException
+ */
+ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
+ {
+ $this->assertObjectHasAttribute('name', $json);
+ $this->assertObjectHasAttribute('license', $json);
+ $this->assertObjectHasAttribute('type', $json);
+ $this->assertObjectHasAttribute('version', $json);
+ $this->assertVersionInSync($json->name, $json->version);
+ $this->assertObjectHasAttribute('require', $json);
+ $this->assertEquals($packageType, $json->type);
+ if ($packageType !== 'project') {
+ self::$dependencies[] = $json->name;
+ $this->assertHasMap($json);
+ $this->assertMapConsistent($dir, $json);
+ }
+ switch ($packageType) {
+ case 'magento2-module':
+ $xml = simplexml_load_file("$dir/etc/module.xml");
+ $this->assertConsistentModuleName($xml, $json->name);
+ $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) {
+ if (MagentoComponent::matchMagentoComponent($key)) {
+ $dependenciesListed[] = $key;
+ }
+ }
+ sort($dependenciesListed);
+ $nonDeclaredDependencies = array_diff(self::$dependencies, $dependenciesListed);
+ $nonexistentDependencies = array_diff($dependenciesListed, self::$dependencies);
+ $this->assertEmpty(
+ $nonDeclaredDependencies,
+ 'Following dependencies are not declared in the root composer.json: '
+ . join(', ', $nonDeclaredDependencies)
+ );
+ $this->assertEmpty(
+ $nonexistentDependencies,
+ 'Following dependencies declared in the root composer.json do not exist: '
+ . join(', ', $nonexistentDependencies)
+ );
+ break;
+ default:
+ throw new \InvalidArgumentException("Unknown package type {$packageType}");
+ }
+ }
+
+ /**
+ * Assert that there is map in specified composer json
+ *
+ * @param \StdClass $json
+ */
+ private function assertHasMap(\StdClass $json)
+ {
+ $error = 'There must be an "extra->map" node in composer.json of each Magento component.';
+ $this->assertObjectHasAttribute('extra', $json, $error);
+ $this->assertObjectHasAttribute('map', $json->extra, $error);
+ $this->assertInternalType('array', $json->extra->map, $error);
+ }
+
+ /**
+ * Assert that component directory name and mapping information are consistent
+ *
+ * @param string $dir
+ * @param \StdClass $json
+ */
+ private function assertMapConsistent($dir, $json)
+ {
+ preg_match('/^.+\/(.+)\/(.+)$/', $dir, $matches);
+ list(, $vendor, $name) = $matches;
+ $map = $json->extra->map;
+ $this->assertArrayHasKey(0, $map);
+ $this->assertArrayHasKey(1, $map[0]);
+ $this->assertRegExp(
+ "/{$vendor}\\/{$name}$/",
+ $map[0][1],
+ 'Mapping info is inconsistent with the directory structure'
+ );
+ }
+
+ /**
+ * Enforce package naming conventions for modules
+ *
+ * @param \SimpleXMLElement $xml
+ * @param string $packageName
+ */
+ private function assertConsistentModuleName(\SimpleXMLElement $xml, $packageName)
+ {
+ $moduleName = (string)$xml->module->attributes()->name;
+ $this->assertEquals(
+ $packageName,
+ $this->convertModuleToPackageName($moduleName),
+ "For the module '{$moduleName}', the expected package name is '{$packageName}'"
+ );
+ }
+
+ /**
+ * Make sure a component depends on php version
+ *
+ * @param \StdClass $json
+ */
+ private function assertDependsOnPhp(\StdClass $json)
+ {
+ $this->assertObjectHasAttribute('php', $json, 'This component is expected to depend on certain PHP version(s)');
+ }
+
+ /**
+ * Make sure a component depends on magento/framework component
+ *
+ * @param \StdClass $json
+ */
+ private function assertDependsOnFramework(\StdClass $json)
+ {
+ $this->assertObjectHasAttribute(
+ 'magento/framework',
+ $json,
+ 'This component is expected to depend on magento/framework'
+ );
+ }
+
+ /**
+ * Make sure a component depends on Magento Composer Installer component
+ *
+ * @param \StdClass $json
+ */
+ private function assertDependsOnInstaller(\StdClass $json)
+ {
+ $this->assertObjectHasAttribute(
+ 'magento/magento-composer-installer',
+ $json,
+ 'This component is expected to depend on magento/magento-composer-installer'
+ );
+ }
+
+ /**
+ * Assert that versions in root composer.json and Magento component's composer.json are not out of sync
+ *
+ * @param string $name
+ * @param string $version
+ */
+ private function assertVersionInSync($name, $version)
+ {
+ $this->assertEquals(
+ self::$rootJson['version'],
+ $version,
+ "Version {$version} in component {$name} is inconsistent with version "
+ . 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 (array_keys((array)$json->require) as $depName) {
+ 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
+ *
+ * @param string $moduleName
+ * @return string
+ */
+ private function convertModuleToPackageName($moduleName)
+ {
+ list($vendor, $name) = explode('_', $moduleName, 2);
+ $package = 'module';
+ foreach (preg_split('/([A-Z][a-z\d]+)/', $name, -1, PREG_SPLIT_DELIM_CAPTURE) as $chunk) {
+ $package .= $chunk ? "-{$chunk}" : '';
+ }
+ return strtolower("{$vendor}/{$package}");
+ }
+
+ /**
+ * Create shell wrapper
+ *
+ * @return \Magento\Framework\Shell
+ */
+ private static function createShell()
+ {
+ return new Shell(new Shell\CommandRenderer, null);
+ }
+
+ /**
+ * Check if composer command is available in the environment
+ *
+ * @return bool
+ */
+ private static function isComposerAvailable()
+ {
+ try {
+ self::$shell->execute(self::$composerPath . ' --version');
+ } catch (Exception $e) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Skip the test if composer is unavailable
+ */
+ private function assertComposerAvailable()
+ {
+ if (!self::$isComposerAvailable) {
+ $this->markTestSkipped();
+ }
+ }
+
+ public function testComponentPathsInRoot()
+ {
+ 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->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) {
+ if (is_string($element)) {
+ $flat[] = [$key, $element];
+ } elseif (is_array($element)) {
+ foreach ($element as $path) {
+ $flat[] = [$key, $path];
+ }
+ } else {
+ throw new \Exception("Unexpected element 'in extra->component_paths' section");
+ }
+ }
+ while (list(, list($component, $path)) = each($flat)) {
+ $this->assertFileExists(
+ self::$root . '/' . $path,
+ "Missing or invalid component path: {$component} -> {$path}"
+ );
+ $this->assertArrayHasKey(
+ $component,
+ self::$rootJson['replace'],
+ "The {$component} is specified in 'extra->component_paths', but missing in 'replace' section"
+ );
+ }
+ }
+}
diff --git a/lib/internal/Magento/Framework/Composer/MagentoComponent.php b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
new file mode 100644
index 00000000000..4ec96eeed9f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Framework\Composer;
+
+class MagentoComponent {
+ /**
+ * Get matched Magento component or empty array, if it's not a Magento component
+ *
+ * @param string $key
+ * @return string[] ['type' => '<type>', 'area' => '<area>', 'name' => '<name>']
+ * Ex.: ['type' => 'module', 'name' => 'catalog']
+ * ['type' => 'theme', 'area' => 'frontend', 'name' => 'blank']
+ */
+ public static function matchMagentoComponent($key)
+ {
+ $typePattern = 'module|theme|language|framework';
+ $areaPattern = 'frontend|adminhtml';
+ $namePattern = '[a-z_-]+';
+ $regex = '/^magento\/(?P<type>' . $typePattern . ')(?:-(?P<area>' . $areaPattern . '))?(?:-(?P<name>'
+ . $namePattern . '))?$/';
+ if (preg_match($regex, $key, $matches)) {
+ return $matches;
+ }
+ return [];
+ }
+}
--
GitLab
From 3ff27c21c8b2a1b1bebddd8d1b3c382f3f46526f Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Thu, 18 Dec 2014 16:54:21 -0600
Subject: [PATCH 002/120] MAGETWO-31118: Subtotal Including Tax on invoice is
discounted
- fixed
---
.../Model/Order/Invoice/Total/Subtotal.php | 35 ++-----------------
1 file changed, 2 insertions(+), 33 deletions(-)
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php
index 959820d7712..b15fce9617d 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Subtotal.php
@@ -36,46 +36,15 @@ class Subtotal extends AbstractTotal
$allowedSubtotal = $order->getSubtotal() - $order->getSubtotalInvoiced();
$baseAllowedSubtotal = $order->getBaseSubtotal() - $order->getBaseSubtotalInvoiced();
- $allowedSubtotalInclTax = $allowedSubtotal +
- $order->getHiddenTaxAmount() +
- $order->getTaxAmount() -
- $order->getTaxInvoiced() -
- $order->getHiddenTaxInvoiced();
- $baseAllowedSubtotalInclTax = $baseAllowedSubtotal +
- $order->getBaseHiddenTaxAmount() +
- $order->getBaseTaxAmount() -
- $order->getBaseTaxInvoiced() -
- $order->getBaseHiddenTaxInvoiced();
-
- /**
- * Check if shipping tax calculation is included to current invoice.
- */
- $includeShippingTax = true;
- foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
- if ($previousInvoice->getShippingAmount() && !$previousInvoice->isCanceled()) {
- $includeShippingTax = false;
- break;
- }
- }
-
- if ($includeShippingTax) {
- $allowedSubtotalInclTax -= $order->getShippingTaxAmount();
- $baseAllowedSubtotalInclTax -= $order->getBaseShippingTaxAmount();
- } else {
- $allowedSubtotalInclTax += $order->getShippingHiddenTaxAmount();
- $baseAllowedSubtotalInclTax += $order->getBaseShippingHiddenTaxAmount();
- }
+ //Note: The $subtotalInclTax and $baseSubtotalInclTax are not adjusted from those provide by the line items
+ //because the "InclTax" is displayed before any tax adjustments based on discounts, shipping, etc.
if ($invoice->isLast()) {
$subtotal = $allowedSubtotal;
$baseSubtotal = $baseAllowedSubtotal;
- $subtotalInclTax = $allowedSubtotalInclTax;
- $baseSubtotalInclTax = $baseAllowedSubtotalInclTax;
} else {
$subtotal = min($allowedSubtotal, $subtotal);
$baseSubtotal = min($baseAllowedSubtotal, $baseSubtotal);
- $subtotalInclTax = min($allowedSubtotalInclTax, $subtotalInclTax);
- $baseSubtotalInclTax = min($baseAllowedSubtotalInclTax, $baseSubtotalInclTax);
}
$invoice->setSubtotal($subtotal);
--
GitLab
From fb6714b6578e8c6cbb389962e13f0ef31d6df12f Mon Sep 17 00:00:00 2001
From: Vladyslav Shcherbyna <vshcherbyna@ebay.com>
Date: Fri, 19 Dec 2014 13:27:52 +0200
Subject: [PATCH 003/120] MAGETWO-31966: Empty title for success placed order
page
---
app/code/Magento/Checkout/Controller/Onepage/Success.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index 9870718aef5..b09ac1a2616 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -23,6 +23,7 @@ class Success extends \Magento\Checkout\Controller\Onepage
//@todo: Refactor it to match CQRS
$this->_view->loadLayout();
$this->_view->getLayout()->initMessages();
+ $this->_view->getPage()->getConfig()->getTitle()->set(__('Thank you for your purchase!'));
$this->_eventManager->dispatch(
'checkout_onepage_controller_success_action',
['order_ids' => [$session->getLastOrderId()]]
--
GitLab
From 256fc4434eb88ea12e65c04bff7d189a84ed0bc6 Mon Sep 17 00:00:00 2001
From: Vladyslav Shcherbyna <vshcherbyna@ebay.com>
Date: Fri, 19 Dec 2014 13:29:35 +0200
Subject: [PATCH 004/120] MAGETWO-31966: Empty title for success placed order
page
---
app/code/Magento/Checkout/Controller/Onepage/Success.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index b09ac1a2616..072ed80dc1b 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -23,7 +23,7 @@ class Success extends \Magento\Checkout\Controller\Onepage
//@todo: Refactor it to match CQRS
$this->_view->loadLayout();
$this->_view->getLayout()->initMessages();
- $this->_view->getPage()->getConfig()->getTitle()->set(__('Thank you for your purchase!'));
+ $this->_view->getPage()->getConfig()->getTitle()->set(__('Success Page'));
$this->_eventManager->dispatch(
'checkout_onepage_controller_success_action',
['order_ids' => [$session->getLastOrderId()]]
--
GitLab
From daa1c7b88309b256ba5ee832d96d92c44490dd3d Mon Sep 17 00:00:00 2001
From: Vladyslav Shcherbyna <vshcherbyna@ebay.com>
Date: Fri, 19 Dec 2014 17:08:21 +0200
Subject: [PATCH 005/120] MAGETWO-31966: Empty title for success placed order
page - move to layout
---
app/code/Magento/Checkout/Controller/Onepage/Success.php | 1 -
.../Checkout/view/frontend/layout/checkout_onepage_success.xml | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index 072ed80dc1b..9870718aef5 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -23,7 +23,6 @@ class Success extends \Magento\Checkout\Controller\Onepage
//@todo: Refactor it to match CQRS
$this->_view->loadLayout();
$this->_view->getLayout()->initMessages();
- $this->_view->getPage()->getConfig()->getTitle()->set(__('Success Page'));
$this->_eventManager->dispatch(
'checkout_onepage_controller_success_action',
['order_ids' => [$session->getLastOrderId()]]
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
index 539bc06711c..ef4db4f99e2 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
@@ -5,6 +5,9 @@
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+ <head>
+ <title>Success Page</title>
+ </head>
<body>
<referenceBlock name="page.main.title">
<block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success.print.button" template="button.phtml"/>
--
GitLab
From 375d189372b7291d3529f0e0fa5113aaefbe3324 Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Fri, 19 Dec 2014 11:16:06 -0600
Subject: [PATCH 006/120] MAGETWO-28549: typo in public function
getCalculationAgorithm
- fixed
---
.../Bundle/Pricing/Adjustment/Calculator.php | 2 +-
app/code/Magento/Tax/Helper/Data.php | 2 +-
app/code/Magento/Tax/Model/Config.php | 2 +-
app/code/Magento/Tax/Model/Observer.php | 2 +-
.../Weee/Model/Total/Quote/WeeeTaxTest.php | 18 ++++++++---------
.../Weee/Model/Total/Quote/WeeeTest.php | 20 +++++++++----------
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index e15bbbf89f1..3a1c5b56dc5 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -313,7 +313,7 @@ class Calculator implements BundleCalculatorInterface
/** @var Store $store */
$store = $bundleProduct->getStore();
- $roundingMethod = $this->taxHelper->getCalculationAgorithm($store);
+ $roundingMethod = $this->taxHelper->getCalculationAlgorithm($store);
foreach ($amountList as $amountInfo) {
/** @var \Magento\Framework\Pricing\Amount\AmountInterface $itemAmount */
$itemAmount = $amountInfo['amount'];
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 26e3386435f..9ce9e7ca4d5 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -628,7 +628,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param null|string|bool|int|Store $store
* @return string
*/
- public function getCalculationAgorithm($store = null)
+ public function getCalculationAlgorithm($store = null)
{
return $this->_config->getAlgorithm($store);
}
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index bfd8e11e649..86a5e6d7dbc 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -269,7 +269,7 @@ class Config
}
/**
- * Get defined tax calculation agorithm
+ * Get defined tax calculation algorithm
*
* @param null|string|bool|int|Store $store
* @return string
diff --git a/app/code/Magento/Tax/Model/Observer.php b/app/code/Magento/Tax/Model/Observer.php
index da2ad2ba127..d674c3d7a47 100644
--- a/app/code/Magento/Tax/Model/Observer.php
+++ b/app/code/Magento/Tax/Model/Observer.php
@@ -299,7 +299,7 @@ class Observer
return $this;
}
- $algorithm = $this->_taxData->getCalculationAgorithm();
+ $algorithm = $this->_taxData->getCalculationAlgorithm();
$options['calculationAlgorithm'] = $algorithm;
// prepare correct template for options render
if ($this->_taxData->displayBothPrices()) {
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTaxTest.php
index 6086e0a44b0..ab317faba4d 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTaxTest.php
@@ -278,7 +278,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_taxable_unit_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -322,7 +322,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_taxable_unit_not_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -366,7 +366,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
$data['price_excl_tax_weee_taxable_unit_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => false,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -410,7 +410,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_non_taxable_unit_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -448,7 +448,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
$data['price_excl_tax_weee_non_taxable_unit_include_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => false,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -486,7 +486,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_taxable_row_include_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -530,7 +530,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
$data['price_excl_tax_weee_taxable_row_include_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => false,
- 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -574,7 +574,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_non_taxable_row_include_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -612,7 +612,7 @@ class WeeeTaxTest extends \PHPUnit_Framework_TestCase
$data['price_excl_tax_weee_non_taxable_row_not_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => false,
- 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
],
'weee_config' => [
'isEnabled' => true,
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php
index 62935f81d6b..fd673096c7e 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Quote/WeeeTest.php
@@ -220,7 +220,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_taxable_unit_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -260,7 +260,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_taxable_unit_not_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -300,7 +300,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_excl_tax_weee_taxable_unit_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => false,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -340,7 +340,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_non_taxable_unit_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -382,7 +382,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_excl_tax_weee_non_taxable_unit_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => false,
- 'getCalculationAgorithm' => Calculation::CALC_UNIT_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_UNIT_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -424,7 +424,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_taxable_row_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -464,7 +464,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_excl_tax_weee_taxable_row_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => false,
- 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -504,7 +504,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_incl_tax_weee_non_taxable_row_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => true,
- 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -546,7 +546,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_excl_tax_weee_non_taxable_row_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => false,
- 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
],
'weee_config' => [
'isEnabled' => true,
@@ -588,7 +588,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
$data['price_excl_tax_weee_non_taxable_row_not_included_in_subtotal'] = [
'tax_config' => [
'priceIncludesTax' => false,
- 'getCalculationAgorithm' => Calculation::CALC_ROW_BASE,
+ 'getCalculationAlgorithm' => Calculation::CALC_ROW_BASE,
],
'weee_config' => [
'isEnabled' => true,
--
GitLab
From e1e4dd6e5cd2018775d7943fcb271dc7fe0be1ec Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Fri, 19 Dec 2014 11:29:00 -0600
Subject: [PATCH 007/120] MAGETWO-28380: Totals taxes sorting is different on
order/invoice/refund create and view pages
- fixed
- updated unit test
---
app/code/Magento/Tax/Helper/Data.php | 49 +++++++------
.../testsuite/Magento/Tax/Helper/DataTest.php | 70 +++++++++++++++++++
2 files changed, 99 insertions(+), 20 deletions(-)
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 26e3386435f..a30fc64cc96 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -682,17 +682,23 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* 'tax_amount' => $taxAmount,
* 'base_tax_amount' => $baseTaxAmount,
* 'title' => $title,
- * 'percent' => $percent
+ * 'percent' => $percent,
+ * 'type' => $type
* )
* )
*
* @param array $taxClassAmount
* @param OrderTaxDetailsItemInterface $itemTaxDetail
* @param float $ratio
+ * @param string $type
* @return array
*/
- private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
- {
+ private function _aggregateTaxes(
+ $taxClassAmount,
+ OrderTaxDetailsItemInterface $itemTaxDetail,
+ $ratio,
+ $type = 'product'
+ ) {
$itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
foreach ($itemAppliedTaxes as $itemAppliedTax) {
$taxAmount = $itemAppliedTax->getAmount() * $ratio;
@@ -705,6 +711,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
if (!isset($taxClassAmount[$taxCode])) {
$taxClassAmount[$taxCode]['title'] = $itemAppliedTax->getTitle();
$taxClassAmount[$taxCode]['percent'] = $itemAppliedTax->getPercent();
+ $taxClassAmount[$taxCode]['type'] = $type;
$taxClassAmount[$taxCode]['tax_amount'] = $taxAmount;
$taxClassAmount[$taxCode]['base_tax_amount'] = $baseTaxAmount;
} else {
@@ -796,23 +803,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getId());
- // Apply any taxes for shipping
- $shippingTaxAmount = $salesItem->getShippingTaxAmount();
- $originalShippingTaxAmount = $order->getShippingTaxAmount();
- if ($shippingTaxAmount && $originalShippingTaxAmount &&
- $shippingTaxAmount != 0 && floatval($originalShippingTaxAmount)
- ) {
- //An invoice or credit memo can have a different qty than its order
- $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
- $itemTaxDetails = $orderTaxDetails->getItems();
- foreach ($itemTaxDetails as $itemTaxDetail) {
- //Aggregate taxable items associated with shipping
- if ($itemTaxDetail->getType() == \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING) {
- $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
- }
- }
- }
-
// Apply any taxes for the items
/** @var $item \Magento\Sales\Model\Order\Invoice\Item|\Magento\Sales\Model\Order\Creditmemo\Item */
foreach ($salesItem->getItems() as $item) {
@@ -844,6 +834,25 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
}
}
+ // Apply any taxes for shipping
+ $shippingType = \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING;
+ $shippingTaxAmount = $salesItem->getShippingTaxAmount();
+ $originalShippingTaxAmount = $order->getShippingTaxAmount();
+ if ($shippingTaxAmount && $originalShippingTaxAmount &&
+ $shippingTaxAmount != 0 && floatval($originalShippingTaxAmount)
+ ) {
+ //An invoice or credit memo can have a different qty than its order
+ $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
+ $itemTaxDetails = $orderTaxDetails->getItems();
+ foreach ($itemTaxDetails as $itemTaxDetail) {
+ //Aggregate taxable items associated with shipping
+ if ($itemTaxDetail->getType() == $shippingType) {
+ $taxClassAmount =
+ $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio, $shippingType);
+ }
+ }
+ }
+
return $taxClassAmount;
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
index 01af7e21592..6b01c6385e2 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
@@ -301,6 +301,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
'percent' => 20.0,
'tax_amount' => 2.5,
'base_tax_amount' => 2.5,
+ 'type' => 'product',
],
],
],
@@ -362,6 +363,75 @@ class DataTest extends \PHPUnit_Framework_TestCase
'percent' => 20.0,
'tax_amount' => 6.5,
'base_tax_amount' => 6.5,
+ 'type' => 'product',
+ ],
+ ],
+ ],
+ //Scenario 3: one item, with both shipping and product taxes
+ 'one_item_with_both_shipping_and_product_taxes' => [
+ 'order' => [
+ 'order_id' => 1,
+ 'shipping_tax_amount' => 2,
+ 'order_tax_details' => [
+ 'items' => [
+ 'shippingTax1' => [
+ 'item_id' => null,
+ 'type' => 'shipping',
+ 'applied_taxes' => [
+ [
+ 'amount' => 2.0,
+ 'base_amount' => 2.0,
+ 'code' => 'US-CA-Ship',
+ 'title' => 'US-CA-Sales-Tax-Ship',
+ 'percent' => 10.0,
+ ],
+ ],
+ ],
+ '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' => [
+ 'shipping_tax_amount' => 2,
+ 'invoice_items' => [
+ 'item1' => new MagentoObject(
+ [
+ 'order_item' => new MagentoObject(
+ [
+ 'id' => 1,
+ 'tax_amount' => 5.00,
+ ]
+ ),
+ 'tax_amount' => 5.00,
+ ]
+ ),
+ ],
+ ],
+ 'expected_results' => [
+ [
+ 'title' => 'US-CA-Sales-Tax',
+ 'percent' => 20.0,
+ 'tax_amount' => 5.00,
+ 'base_tax_amount' => 5.00,
+ 'type' => 'product',
+ ],
+ [
+ 'title' => 'US-CA-Sales-Tax-Ship',
+ 'percent' => 10.0,
+ 'tax_amount' => 2.00,
+ 'base_tax_amount' => 2.00,
+ 'type' => 'shipping',
],
],
],
--
GitLab
From d5ab0710c1ddcc23dfd1f517f743366dbdfa5091 Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Fri, 19 Dec 2014 11:58:27 -0600
Subject: [PATCH 008/120] MAGETWO-30745: CsvImportHandler Tests still refer to
links from Tax module instead of TaxImportExport Module
- fixed
---
.../Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
index 2f3fe5e8ca8..6d6515c6ed6 100644
--- a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
@@ -7,7 +7,7 @@ namespace Magento\TaxImportExport\Model\Rate;
class CsvImportHandlerTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Tax\Model\Rate\CsvImportHandler
+ * @var \Magento\TaxImportExport\Model\Rate\CsvImportHandler
*/
protected $_importHandler;
--
GitLab
From e7db99eb424eb95f290a71a845f0a2fbc3a7c035 Mon Sep 17 00:00:00 2001
From: Vladyslav Shcherbyna <vshcherbyna@ebay.com>
Date: Mon, 22 Dec 2014 16:18:08 +0200
Subject: [PATCH 009/120] MAGETWO-31967: Exception page instead of 404 when
edit url for product with required configuration
---
.../Checkout/Controller/Cart/Configure.php | 13 +-
.../Controller/Cart/ConfigureTest.php | 252 ++++++++++++++++++
2 files changed, 259 insertions(+), 6 deletions(-)
create mode 100644 dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 8731afaae8d..b514eefc596 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -43,18 +43,19 @@ class Configure extends \Magento\Checkout\Controller\Cart
{
// Extract item and product to configure
$id = (int)$this->getRequest()->getParam('id');
+ $productId = (int)$this->getRequest()->getParam('product_id');
$quoteItem = null;
if ($id) {
$quoteItem = $this->cart->getQuote()->getItemById($id);
}
- if (!$quoteItem) {
- $this->messageManager->addError(__("We can't find the quote item."));
- $this->_redirect('checkout/cart');
- return;
- }
-
try {
+ if (!$quoteItem || $productId != $quoteItem->getProduct()->getId()) {
+ $this->messageManager->addError(__("We can't find the quote item."));
+ $this->_redirect('checkout/cart');
+ return;
+ }
+
$params = new \Magento\Framework\Object();
$params->setCategoryId(false);
$params->setConfigureMode(true);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
new file mode 100644
index 00000000000..7548af64e81
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license {license_link}
+ */
+namespace Magento\Checkout\Controller\Cart;
+
+/**
+ * Shopping cart edit tests
+ */
+class ConfigureTest extends \PHPUnit_Framework_TestCase
+{
+
+ /**
+ * @var \Magento\Framework\ObjectManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $objectManagerMock;
+
+ /**
+ * @var \Magento\Framework\View\Result\PageFactory | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $resultPageFactoryMock;
+
+ /**
+ * @var \Magento\Framework\App\ResponseInterface | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $responseMock;
+
+ /**
+ * @var \Magento\Framework\App\RequestInterface | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $requestMock;
+
+ /**
+ * @var \Magento\Framework\Message\ManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $messageManagerMock;
+
+ /**
+ * @var \Magento\Framework\App\Response\RedirectInterface | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $redirectMock;
+
+ /**
+ * @var \Magento\Checkout\Controller\Cart\Configure | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $configureController;
+
+ /**
+ * @var \Magento\Framework\App\Action\Context | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $contextMock;
+
+ /**
+ * @var \Magento\Checkout\Model\Cart | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $cartMock;
+
+ public function setUp()
+ {
+ $eventManagerMock = $this->getMockBuilder('Magento\Framework\Event\ManagerInterface')
+ ->disableOriginalConstructor()
+ ->setMethods([])
+ ->getMockForAbstractClass();
+ $urlMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
+ ->disableOriginalConstructor()
+ ->setMethods([])
+ ->getMockForAbstractClass();
+ $actionFlagMock = $this->getMockBuilder('Magento\Framework\App\ActionFlag')
+ ->disableOriginalConstructor()
+ ->setMethods([])
+ ->getMockForAbstractClass();
+ $viewMock = $this->getMockBuilder('Magento\Framework\App\ViewInterface')
+ ->disableOriginalConstructor()
+ ->setMethods([])
+ ->getMockForAbstractClass();
+ $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface')
+ ->disableOriginalConstructor()
+ ->setMethods([])
+ ->getMockForAbstractClass();
+ $this->responseMock = $this->getMockBuilder('Magento\Framework\App\ResponseInterface')
+ ->disableOriginalConstructor()
+ ->setMethods([])
+ ->getMockForAbstractClass();
+ $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
+ ->disableOriginalConstructor()
+ ->setMethods(['getParam'])
+ ->getMockForAbstractClass();
+ $this->messageManagerMock = $this->getMockBuilder('Magento\Framework\Message\ManagerInterface')
+ ->disableOriginalConstructor()
+ ->setMethods([])
+ ->getMockForAbstractClass();
+ $this->redirectMock = $this->getMockBuilder('Magento\Framework\App\Response\RedirectInterface')
+ ->disableOriginalConstructor()
+ ->setMethods([])
+ ->getMock();
+
+ $this->contextMock = $this->getMockBuilder('Magento\Framework\App\Action\Context')
+ ->setConstructorArgs(
+ [
+ $this->requestMock,
+ $this->responseMock,
+ $this->objectManagerMock,
+ $eventManagerMock,
+ $urlMock,
+ $this->redirectMock,
+ $actionFlagMock,
+ $viewMock,
+ $this->messageManagerMock
+ ]
+ )
+ ->setMethods([])
+ ->getMock();
+ $this->contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
+ $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
+ $this->contextMock->expects($this->any())->method('getResponse')->willReturn($this->responseMock);
+ $this->contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messageManagerMock);
+ $this->contextMock->expects($this->any())->method('getRedirect')->willReturn($this->redirectMock);
+ $scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $session = $this->getMockBuilder('Magento\Checkout\Model\Session')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $formKeyValidator = $this->getMockBuilder('Magento\Core\App\Action\FormKeyValidator')
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $this->cartMock = $this->getMockBuilder('Magento\Checkout\Model\Cart')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->configureController = new \Magento\Checkout\Controller\Cart\Configure(
+ $this->contextMock,
+ $scopeConfig,
+ $session,
+ $storeManager,
+ $formKeyValidator,
+ $this->cartMock,
+ $this->resultPageFactoryMock
+ );
+ }
+
+ /**
+ * Test checks controller call product view and send parameter to it
+ *
+ * @return void
+ */
+ public function testPrepareAndRenderCall()
+ {
+ $quoteId = 1;
+ $actualProductId = 1;
+ $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $quoteItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $viewMock = $this->getMockBuilder('Magento\Catalog\Helper\Product\View')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $pageMock = $this->getMockBuilder('Magento\Framework\View\Result\Page')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $buyRequestMock = $this->getMockBuilder('Magento\Framework\Object')
+ ->disableOriginalConstructor()
+ ->getMock();
+ //expects
+ $this->requestMock->expects($this->at(0))
+ ->method('getParam')
+ ->with('id')
+ ->willReturn($quoteId);
+ $this->requestMock->expects($this->at(1))
+ ->method('getParam')
+ ->with('product_id')
+ ->willReturn($actualProductId);
+ $this->cartMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
+
+ $quoteItemMock->expects($this->exactly(1))->method('getBuyRequest')->willReturn($buyRequestMock);
+
+ $this->resultPageFactoryMock->expects($this->once())->method('create')->willReturn($pageMock);
+ $this->objectManagerMock->expects($this->at(0))
+ ->method('get')
+ ->with('Magento\Catalog\Helper\Product\View')
+ ->willReturn($viewMock);
+
+ $viewMock->expects($this->once())->method('prepareAndRender')->with(
+ $pageMock,
+ $actualProductId,
+ $this->configureController,
+ $this->callback(
+ function ($subject) use ($buyRequestMock) {
+ return $subject->getBuyRequest() === $buyRequestMock;
+ }
+ )
+ )->willReturn($pageMock);
+
+ $quoteMock->expects($this->once())->method('getItemById')->willReturn($quoteItemMock);
+ $quoteItemMock->expects($this->exactly(2))->method('getProduct')->willReturn($productMock);
+
+ $productMock->expects($this->exactly(2))->method('getId')->willReturn($actualProductId);
+
+ $this->assertSame($pageMock, $this->configureController->execute());
+ }
+
+ /**
+ * Test checks controller redirect user to cart
+ * if user request product id in cart edit page is not same as quota product id
+ *
+ * @return void
+ */
+ public function testRedirectWithWrongProductId()
+ {
+ $quotaId = 1;
+ $productIdInQuota = 1;
+ $productIdInRequest = null;
+ $quoteItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->requestMock->expects($this->at(0))
+ ->method('getParam')
+ ->with('id')
+ ->willReturn($quotaId);
+ $this->requestMock->expects($this->at(1))
+ ->method('getParam')
+ ->with('product_id')
+ ->willReturn($productIdInRequest);
+ $this->cartMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
+ $quoteMock->expects($this->once())->method('getItemById')->willReturn($quoteItemMock);
+ $quoteItemMock->expects($this->exactly(1))->method('getProduct')->willReturn($productMock);
+ $productMock->expects($this->exactly(1))->method('getId')->willReturn($productIdInQuota);
+ $this->messageManagerMock->expects($this->once())->method('addError');
+ $this->redirectMock->expects($this->once())->method('redirect')->with($this->responseMock, 'checkout/cart', []);
+ $this->configureController->execute();
+ }
+}
--
GitLab
From 45921f2bf8f46bd3ea3a1799d9abbcce09212940 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Wed, 24 Dec 2014 17:31:25 -0600
Subject: [PATCH 010/120] MAGETWO-31732: Blacklisted ComposerTest
- added test for forgotten "replace" packages
---
composer.json | 2 --
.../testsuite/Magento/Test/Integrity/ComposerTest.php | 9 +++++++++
.../Magento/Framework/Composer/MagentoComponent.php | 3 ++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/composer.json b/composer.json
index 7d2f6520184..8735194635f 100644
--- a/composer.json
+++ b/composer.json
@@ -143,9 +143,7 @@
"magento/language-pt_br": "self.version",
"magento/language-zh_cn": "self.version",
"magento/framework": "self.version",
- "magento/project-setup": "0.1.0",
"oyejorge/less.php": "1.7.0",
- "symfony/yaml": "2.3.x-dev",
"trentrichardson/jquery-timepicker-addon": "1.4.3",
"components/handlebars.js": "1.3.0",
"colinmollenhour/cache-backend-redis": "dev-master#193d377b7fb2e88595578b282fa01a62d1185abc",
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index f79d5aaae07..87ee01254e8 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -414,5 +414,14 @@ class ComposerTest extends \PHPUnit_Framework_TestCase
"The {$component} is specified in 'extra->component_paths', but missing in 'replace' section"
);
}
+ foreach (array_keys(self::$rootJson['replace']) as $replace) {
+ if (!MagentoComponent::matchMagentoComponent($replace)) {
+ $this->assertArrayHasKey(
+ $replace,
+ self::$rootJson['extra']['component_paths'],
+ "The {$replace} is specified in 'replace', but missing in 'extra->component_paths' section"
+ );
+ }
+ }
}
}
diff --git a/lib/internal/Magento/Framework/Composer/MagentoComponent.php b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
index 4ec96eeed9f..b73b873e68d 100644
--- a/lib/internal/Magento/Framework/Composer/MagentoComponent.php
+++ b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
@@ -4,7 +4,8 @@
*/
namespace Magento\Framework\Composer;
-class MagentoComponent {
+class MagentoComponent
+{
/**
* Get matched Magento component or empty array, if it's not a Magento component
*
--
GitLab
From 51b74d14eee2ff8e383e9e6d755ab87d9fdf889b Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Thu, 25 Dec 2014 18:46:45 +0200
Subject: [PATCH 011/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- Added test to new repo
---
.../Catalog/Test/Block/Product/Price.php | 10 +-
.../GroupPriceOptions.php | 2 +
.../Test/TestStep/CreateProductStep.php | 3 +-
.../Test/Repository/CatalogRule.php | 11 +
.../Test/TestStep/CreateCatalogRuleStep.php | 64 +++++
.../Checkout/Test/Block/Cart/CartItem.php | 34 ++-
.../Checkout/Test/Block/Cart/Totals.php | 59 ++--
...axCalculationAfterCheckoutDownloadable.php | 73 +++++
...axRuleIsAppliedToAllPricesDownloadable.php | 71 +++++
...ckoutDownloadableExcludingIncludingTax.php | 62 +++++
...nAfterCheckoutDownloadableExcludingTax.php | 65 +++++
...nAfterCheckoutDownloadableIncludingTax.php | 62 +++++
...ricesDownloadableExcludingIncludingTax.php | 72 +++++
...iedToAllPricesDownloadableExcludingTax.php | 73 +++++
...iedToAllPricesDownloadableIncludingTax.php | 72 +++++
.../Fixture/DownloadableProductInjectable.php | 2 +-
.../CheckoutData.php | 17 ++
.../GroupPriceOptions.php | 42 +++
.../DownloadableProductInjectable.php | 60 ++++
.../DownloadableTaxCalculationTest.php | 35 +++
.../DownloadableTaxCalculationTest/test.csv | 17 ++
.../Downloadable/Test/etc/constraint.xml | 27 ++
.../Downloadable/Test/etc/scenario.xml | 36 +++
.../Adminhtml/Order/AbstractForm/Product.php | 86 ++++++
.../Adminhtml/Order/AbstractForm/Totals.php | 210 ++++++++++++++
.../Sales/Test/Block/Adminhtml/Order/Grid.php | 7 +
.../Block/Adminhtml/Order/Invoice/Form.php | 2 +-
.../Block/Adminhtml/Order/Invoice/Totals.php | 3 +-
.../Test/Block/Adminhtml/Order/Totals.php | 37 +--
.../Test/Block/Adminhtml/Order/View/Items.php | 94 +++++++
.../Magento/Sales/Test/Block/Order/View.php | 256 ++++++++++++++++++
.../Page/Adminhtml/OrderCreditMemoNew.xml | 5 +
.../AbstractAssertOrderTaxOnBackend.php | 206 ++++++++++++++
...tractAssertTaxCalculationAfterCheckout.php | 157 +++++++++++
...ractAssertTaxRuleIsAppliedToAllPrices.php} | 141 +++-------
...stractAssertTaxWithCrossBorderApplying.php | 2 +-
...OrderTaxOnBackendExcludingIncludingTax.php | 89 ++++++
.../AssertOrderTaxOnBackendExcludingTax.php | 91 +++++++
.../AssertOrderTaxOnBackendIncludingTax.php | 89 ++++++
...tionAfterCheckoutExcludingIncludingTax.php | 62 +++++
...axCalculationAfterCheckoutExcludingTax.php | 63 +++++
...axCalculationAfterCheckoutIncludingTax.php | 62 +++++
...ppliedToAllPricesExcludingIncludingTax.php | 73 +++++
...axRuleIsAppliedToAllPricesExcludingTax.php | 73 +++++
...axRuleIsAppliedToAllPricesIncludingTax.php | 73 +++++
.../Tax/Test/TestStep/CreateTaxRuleStep.php | 65 +++++
.../app/Magento/Tax/Test/etc/constraint.xml | 27 ++
.../app/Magento/Tax/Test/etc/scenario.xml | 39 +++
48 files changed, 2794 insertions(+), 187 deletions(-)
create mode 100644 dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
create mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
create mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
rename dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/{AssertTaxRuleIsAppliedToAllPrices.php => AbstractAssertTaxRuleIsAppliedToAllPrices.php} (54%)
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
create mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
index 10a1c191bd1..0b74cb899d9 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
@@ -293,21 +293,23 @@ class Price extends Block
* Get price excluding tax
*
* @param string $currency
- * @return string
+ * @return string|null
*/
public function getPriceExcludingTax($currency = '$')
{
- return trim($this->_rootElement->find($this->priceExcludingTax)->getText(), $currency);
+ $priceElement = $this->_rootElement->find($this->priceExcludingTax);
+ return $priceElement->isVisible() ? trim($priceElement->getText(), $currency) : null;
}
/**
* Get price including tax
*
* @param string $currency
- * @return string
+ * @return string|null
*/
public function getPriceIncludingTax($currency = '$')
{
- return trim($this->_rootElement->find($this->priceIncludingTax)->getText(), $currency);
+ $priceElement = $this->_rootElement->find($this->priceIncludingTax);
+ return $priceElement->isVisible() ? trim($priceElement->getText(), $currency) : null;
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
index 7cfc80091db..9d22c52bed2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
@@ -68,6 +68,8 @@ class GroupPriceOptions implements FixtureInterface
}
/**
+ * Get preset array
+ *
* @param string $name
* @return mixed|null
*/
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
index 7d173332e1b..453b3c7f875 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
@@ -54,7 +54,6 @@ class CreateProductStep implements TestStepInterface
if ($product->hasData('id') === false) {
$product->persist();
}
-
- return ['product' => $product];
+ return ['product' => $product];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
index b0ea023ce42..1576f4e5e46 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
@@ -87,5 +87,16 @@ class CatalogRule extends AbstractRepository
'simple_action' => 'By Fixed Amount',
'discount_amount' => '10',
];
+
+ $this->_data['catalog_price_rule_all_groups'] = [
+ 'name' => 'catalog_price_rule_all_groups_%isolation%',
+ 'description' => '-50% of price, Priority = 0',
+ 'is_active' => 'Active',
+ 'website_ids' => ['Main Website'],
+ 'customer_group_ids' => ['NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'],
+ 'sort_order' => '0',
+ 'simple_action' => 'By Percentage of the Original Price',
+ 'discount_amount' => '50',
+ ];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
new file mode 100644
index 00000000000..f0c087db7ab
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license {license_link}
+ */
+
+namespace Magento\CatalogRule\Test\TestStep;
+
+use Mtf\Fixture\FixtureFactory;
+use Mtf\TestStep\TestStepInterface;
+
+/**
+ * Creating catalog rule
+ */
+class CreateCatalogRuleStep implements TestStepInterface
+{
+ /**
+ * Catalog Rule dataset name
+ *
+ * @var string
+ */
+ protected $catalogRule;
+
+ /**
+ * Factory for Fixture
+ *
+ * @var FixtureFactory
+ */
+ protected $fixtureFactory;
+
+ /**
+ * Preparing step properties
+ *
+ * @constructor
+ * @param FixtureFactory $fixtureFactory
+ * @param string $catalogRule
+ */
+ public function __construct(FixtureFactory $fixtureFactory, $catalogRule)
+ {
+ $this->fixtureFactory = $fixtureFactory;
+ $this->catalogRule = $catalogRule;
+ }
+
+ /**
+ * Create catalog rule
+ *
+ * @return array
+ */
+ public function run()
+ {
+ $result['catalogRule'] = null;
+ if ($this->catalogRule != '-') {
+ $catalogRule = $this->fixtureFactory->createByCode(
+ 'catalogRule',
+ ['dataSet' => $this->catalogRule]
+ );
+ $catalogRule->persist();
+ $result['catalogRule'] = $catalogRule;
+ }
+ return $result;
+ }
+}
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 c16fd46bb96..57d4fd6ad31 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
@@ -68,23 +68,27 @@ class CartItem extends AbstractCartItem
/**
* Get product price
*
- * @return string
+ * @return string|null
*/
public function getPrice()
{
- $cartProductPrice = $this->_rootElement->find($this->price, Locator::SELECTOR_XPATH)->getText();
- return str_replace(',', '', $this->escapeCurrency($cartProductPrice));
+ $cartProductPrice = $this->_rootElement->find($this->price, Locator::SELECTOR_XPATH);
+ return $cartProductPrice->isVisible()
+ ? str_replace(',', '', $this->escapeCurrency($cartProductPrice->getText()))
+ : null;
}
/**
* Get product price including tax
*
- * @return string
+ * @return string|null
*/
public function getPriceInclTax()
{
- $cartProductPrice = $this->_rootElement->find($this->priceInclTax, Locator::SELECTOR_XPATH)->getText();
- return str_replace(',', '', $this->escapeCurrency($cartProductPrice));
+ $cartProductPrice = $this->_rootElement->find($this->priceInclTax, Locator::SELECTOR_XPATH);
+ return $cartProductPrice->isVisible()
+ ? str_replace(',', '', $this->escapeCurrency($cartProductPrice->getText()))
+ : null;
}
/**
@@ -111,29 +115,33 @@ class CartItem extends AbstractCartItem
/**
* Get sub-total for the specified item in the cart
*
- * @return string
+ * @return string|null
*/
public function getSubtotalPrice()
{
- $price = $this->_rootElement->find($this->subtotalPrice, Locator::SELECTOR_XPATH)->getText();
- return str_replace(',', '', $this->escapeCurrency($price));
+ $cartProductPrice = $this->_rootElement->find($this->subtotalPrice, Locator::SELECTOR_XPATH);
+ return $cartProductPrice->isVisible()
+ ? str_replace(',', '', $this->escapeCurrency($cartProductPrice->getText()))
+ : null;
}
/**
* Get sub-total including tax for the specified item in the cart
*
- * @return string
+ * @return string|null
*/
public function getSubtotalPriceInclTax()
{
- $price = $this->_rootElement->find($this->subTotalPriceInclTax, Locator::SELECTOR_XPATH)->getText();
- return str_replace(',', '', $this->escapeCurrency($price));
+ $cartProductPrice = $this->_rootElement->find($this->subTotalPriceInclTax, Locator::SELECTOR_XPATH);
+ return $cartProductPrice->isVisible()
+ ? str_replace(',', '', $this->escapeCurrency($cartProductPrice->getText()))
+ : null;
}
/**
* Get product options in the cart
*
- * @return string
+ * @return array
*/
public function getOptions()
{
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 a9db2d56823..8c595162815 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(th)="Discount"]//span';
+ protected $discount = '[class=totals] .amount .price';
/**
* Get shipping price including tax selector
@@ -94,45 +94,45 @@ class Totals extends Block
/**
* Get Grand Total Text
*
- * @return array|string
+ * @return string
*/
public function getGrandTotal()
{
- $grandTotal = $this->_rootElement->find($this->grandTotal)->getText();
+ $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_CSS)->getText();
return $this->escapeCurrency($grandTotal);
}
/**
* Get Grand Total Text
*
- * @return string
+ * @return string|null
*/
public function getGrandTotalIncludingTax()
{
- $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS)->getText();
- return $this->escapeCurrency($grandTotal);
+ $priceElement = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS);
+ return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
}
/**
* Get Grand Total Text
*
- * @return string
+ * @return string|null
*/
public function getGrandTotalExcludingTax()
{
- $grandTotal = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_CSS)->getText();
- return $this->escapeCurrency($grandTotal);
+ $priceElement = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_CSS);
+ return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
}
/**
* Get Tax text from Order Totals
*
- * @return array|string
+ * @return string|null
*/
public function getTax()
{
- $taxPrice = $this->_rootElement->find($this->tax, Locator::SELECTOR_CSS)->getText();
- return $this->escapeCurrency($taxPrice);
+ $priceElement = $this->_rootElement->find($this->tax, Locator::SELECTOR_CSS);
+ return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
}
/**
@@ -152,37 +152,37 @@ class Totals extends Block
*/
public function getSubtotal()
{
- $subTotal = $this->_rootElement->find($this->subtotal)->getText();
+ $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_CSS)->getText();
return $this->escapeCurrency($subTotal);
}
/**
* Get Subtotal text
*
- * @return string
+ * @return string|null
*/
public function getSubtotalIncludingTax()
{
- $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_CSS)->getText();
- return $this->escapeCurrency($subTotal);
+ $priceElement = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_CSS);
+ return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
}
/**
* Get Subtotal text
*
- * @return string
+ * @return string|null
*/
public function getSubtotalExcludingTax()
{
- $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_CSS)->getText();
- return $this->escapeCurrency($subTotal);
+ $priceElement = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_CSS);
+ return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
}
/**
* Method that escapes currency symbols
*
* @param string $price
- * @return string
+ * @return string|null
*/
protected function escapeCurrency($price)
{
@@ -193,35 +193,34 @@ class Totals extends Block
/**
* Get discount
*
- * @return string
+ * @return string|null
*/
public function getDiscount()
{
- $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_XPATH)->getText();
- return $this->escapeCurrency($discount);
+ $priceElement = $this->_rootElement->find($this->discount, Locator::SELECTOR_CSS);
+ return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
}
/**
* Get shipping price
*
- * @return string
+ * @return string|null
*/
public function getShippingPrice()
{
- $shippingPrice = $this->_rootElement->find($this->shippingPriceSelector, Locator::SELECTOR_CSS)->getText();
- return $this->escapeCurrency($shippingPrice);
+ $priceElement = $this->_rootElement->find($this->shippingPriceSelector, Locator::SELECTOR_CSS);
+ return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
}
/**
* Get shipping price
*
- * @return string
+ * @return string|null
*/
public function getShippingPriceInclTax()
{
- $shippingPrice = $this->_rootElement
- ->find($this->shippingPriceInclTaxSelector, Locator::SELECTOR_CSS)->getText();
- return $this->escapeCurrency($shippingPrice);
+ $priceElement = $this->_rootElement->find($this->shippingPriceInclTaxSelector, Locator::SELECTOR_CSS);
+ return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
new file mode 100644
index 00000000000..7bc83be16a6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
+use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Sales\Test\Page\OrderView;
+use Mtf\Fixture\InjectableFixture;
+use Magento\Tax\Test\Constraint\AbstractAssertTaxCalculationAfterCheckout;
+
+/**
+ * Checks that prices excl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AbstractAssertTaxCalculationAfterCheckoutDownloadable extends AbstractAssertTaxCalculationAfterCheckout
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that prices on order review and customer order pages are equal to specified in dataset.
+ *
+ * @param array $prices
+ * @param InjectableFixture $product
+ * @param CheckoutCart $checkoutCart
+ * @param CheckoutOnepage $checkoutOnepage
+ * @param CheckoutOnepageSuccess $checkoutOnepageSuccess
+ * @param OrderView $orderView
+ * @return void
+ */
+ public function processAssert(
+ array $prices,
+ InjectableFixture $product,
+ CheckoutCart $checkoutCart,
+ CheckoutOnepage $checkoutOnepage,
+ CheckoutOnepageSuccess $checkoutOnepageSuccess,
+ OrderView $orderView
+ ) {
+ $this->checkoutOnepage = $checkoutOnepage;
+ $this->orderView = $orderView;
+
+ $checkoutCart->getProceedToCheckoutBlock()->proceedToCheckout();
+ $checkoutOnepage->getBillingBlock()->clickContinue();
+ $checkoutOnepage->getPaymentMethodsBlock()->selectPaymentMethod(['method' => 'check_money_order']);
+ $checkoutOnepage->getPaymentMethodsBlock()->clickContinue();
+ $actualPrices = [];
+ $actualPrices = $this->getReviewPrices($actualPrices, $product);
+ $actualPrices = $this->getReviewTotals($actualPrices);
+ $prices = $this->preparePrices($prices);
+ //Order review prices verification
+ $message = 'Prices on order review should be equal to defined in dataset.';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+
+ $checkoutOnepage->getReviewBlock()->placeOrder();
+ $checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId();
+ $checkoutOnepageSuccess->getSuccessBlock()->openOrder();
+ $actualPrices = [];
+ $actualPrices = $this->getOrderPrices($actualPrices, $product);
+ $actualPrices = $this->getOrderTotals($actualPrices);
+
+ //Frontend order prices verification
+ $message = 'Prices on order view page should be equal to defined in dataset.';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
new file mode 100644
index 00000000000..6075d98c4c5
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Tax\Test\Constraint\AbstractAssertTaxRuleIsAppliedToAllPrices;
+use Mtf\Fixture\FixtureFactory;
+use Mtf\Fixture\InjectableFixture;
+
+/**
+ * Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable extends AbstractAssertTaxRuleIsAppliedToAllPrices
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that specified prices are actual on category, product and cart pages.
+ *
+ * @param InjectableFixture $product
+ * @param array $prices
+ * @param int $qty
+ * @param CmsIndex $cmsIndex
+ * @param CatalogCategoryView $catalogCategoryView
+ * @param CatalogProductView $catalogProductView
+ * @param CheckoutCart $checkoutCart
+ * @param FixtureFactory $fixtureFactory
+ * @return void
+ */
+ public function processAssert(
+ InjectableFixture $product,
+ array $prices,
+ $qty,
+ CmsIndex $cmsIndex,
+ CatalogCategoryView $catalogCategoryView,
+ CatalogProductView $catalogProductView,
+ CheckoutCart $checkoutCart,
+ FixtureFactory $fixtureFactory
+ ) {
+ $this->cmsIndex = $cmsIndex;
+ $this->catalogCategoryView = $catalogCategoryView;
+ $this->catalogProductView = $catalogProductView;
+ $this->checkoutCart = $checkoutCart;
+ $actualPrices = [];
+ //Assertion steps
+ $productName = $product->getName();
+ $productCategory = $product->getCategoryIds()[0];
+ $this->openCategory($productCategory);
+ $actualPrices = $this->getCategoryPrices($productName, $actualPrices);
+ $catalogCategoryView->getListProductBlock()->openProductViewPage($productName);
+ $catalogProductView->getViewBlock()->fillOptions($product);
+ $actualPrices = $this->getProductPagePrices($actualPrices);
+ $catalogProductView->getViewBlock()->clickAddToCart();
+ $actualPrices = $this->getCartPrices($product, $actualPrices);
+ $actualPrices = $this->getTotals($actualPrices);
+ //Prices verification
+ $message = 'Prices from dataset should be equal to prices on frontend';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
new file mode 100644
index 00000000000..a686bf97175
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that prices excl and incl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax
+ extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get review totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getReviewTotals($actualPrices)
+ {
+ $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+ $actualPrices['subtotal_excl_tax'] = $reviewBlock->getSubtotalExclTax();
+ $actualPrices['subtotal_incl_tax'] = $reviewBlock->getSubtotalInclTax();
+ $actualPrices['discount'] = $reviewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $reviewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $reviewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get order totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderTotals($actualPrices)
+ {
+ $viewBlock = $this->orderView->getOrderViewBlock();
+ $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotalExclTax();
+ $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotalInclTax();
+ $actualPrices['discount'] = $viewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $viewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
new file mode 100644
index 00000000000..6244b27448f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+use Magento\Customer\Test\Fixture\CustomerInjectable;
+
+/**
+ * Checks that prices excl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutDownloadableExcludingTax
+ extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+{
+ /**
+ * Constraint severeness
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get review totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getReviewTotals($actualPrices)
+ {
+ $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+ $actualPrices['subtotal_excl_tax'] = $reviewBlock->getSubtotal();
+ $actualPrices['subtotal_incl_tax'] = null;
+ $actualPrices['discount'] = $reviewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $reviewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get order totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderTotals($actualPrices)
+ {
+ $viewBlock = $this->orderView->getOrderViewBlock();
+ $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotal();
+ $actualPrices['subtotal_incl_tax'] = null;
+
+ $actualPrices['discount'] = $viewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $viewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
new file mode 100644
index 00000000000..65bef8f5c92
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that prices incl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutDownloadableIncludingTax
+ extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get review totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getReviewTotals($actualPrices)
+ {
+ $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+ $actualPrices['subtotal_excl_tax'] = null;
+ $actualPrices['subtotal_incl_tax'] = $reviewBlock->getSubtotal();
+ $actualPrices['discount'] = $reviewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $reviewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $reviewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get order totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderTotals($actualPrices)
+ {
+ $viewBlock = $this->orderView->getOrderViewBlock();
+ $actualPrices['subtotal_excl_tax'] = null;
+ $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotal();
+ $actualPrices['discount'] = $viewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $viewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
new file mode 100644
index 00000000000..4882be04642
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that prices excl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax
+ extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get prices on category page.
+ *
+ * @param $productName
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getCategoryPrices($productName, $actualPrices)
+ {
+ $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+ $actualPrices['category_price_excl_tax'] = $priceBlock->getPriceExcludingTax();
+ $actualPrices['category_price_incl_tax'] = $priceBlock->getPriceIncludingTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get product view prices.
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getProductPagePrices($actualPrices)
+ {
+ $viewBlock = $this->catalogProductView->getViewBlock();
+ $actualPrices['product_view_price_excl_tax'] = $viewBlock->getProductPriceExcludingTax();
+ $actualPrices['product_view_price_incl_tax'] = $viewBlock->getProductPriceIncludingTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getTotals($actualPrices)
+ {
+ $totalsBlock = $this->checkoutCart->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExcludingTax();
+ $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalIncludingTax();
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExcludingTax();
+ $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalIncludingTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
new file mode 100644
index 00000000000..d22ef997023
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax
+ extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+
+ /**
+ * Get prices on category page.
+ *
+ * @param $productName
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getCategoryPrices($productName, $actualPrices)
+ {
+ $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+ $actualPrices['category_price_excl_tax'] = $priceBlock->getEffectivePrice();
+ $actualPrices['category_price_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get product view prices.
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getProductPagePrices($actualPrices)
+ {
+ $viewBlock = $this->catalogProductView->getViewBlock();
+ $actualPrices['product_view_price_excl_tax'] = $viewBlock->getPriceBlock()->getEffectivePrice();
+ $actualPrices['product_view_price_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getTotals($actualPrices)
+ {
+ $totalsBlock = $this->checkoutCart->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotal();
+ $actualPrices['subtotal_incl_tax'] = null;
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
new file mode 100644
index 00000000000..3c824099019
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\Constraint;
+
+/**
+ * Checks that prices incl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax
+ extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get prices on category page.
+ *
+ * @param $productName
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getCategoryPrices($productName, $actualPrices)
+ {
+ $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+ $actualPrices['category_price_excl_tax'] = null;
+ $actualPrices['category_price_incl_tax'] = $priceBlock->getEffectivePrice();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get product view prices.
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getProductPagePrices($actualPrices)
+ {
+ $viewBlock = $this->catalogProductView->getViewBlock();
+ $actualPrices['product_view_price_excl_tax'] = null;
+ $actualPrices['product_view_price_incl_tax'] = $viewBlock->getPriceBlock()->getEffectivePrice();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getTotals($actualPrices)
+ {
+ $totalsBlock = $this->checkoutCart->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = null;
+ $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotal();
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExcludingTax();
+ $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalIncludingTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
index 1e61caaeb5e..1776aee3b32 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
@@ -143,7 +143,7 @@ class DownloadableProductInjectable extends InjectableFixture
'default_value' => '',
'input' => 'text',
'group' => 'advanced-pricing',
- 'source' => 'Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions',
+ 'source' => '\Magento\Downloadable\Test\Fixture\DownloadableProductInjectable\GroupPriceOptions'
];
protected $has_options = [
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php
index 46d459335b3..5ee427ea18e 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/CheckoutData.php
@@ -79,6 +79,23 @@ class CheckoutData extends \Magento\Catalog\Test\Fixture\CatalogProductSimple\Ch
],
],
],
+
+ 'one_custom_option_and_downloadable_link' => [
+ 'options' => [
+ 'custom_options' => [
+ [
+ 'title' => 'attribute_key_0',
+ 'value' => 'option_key_0'
+ ],
+ ],
+ 'links' => [
+ [
+ 'label' => 'link_1',
+ 'value' => 'Yes'
+ ]
+ ],
+ ]
+ ],
];
return isset($presets[$name]) ? $presets[$name] : [];
}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
new file mode 100644
index 00000000000..14a1482d939
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license {license_link}
+ */
+
+namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
+
+/**
+ * Class GroupPriceOptions
+ *
+ * Data keys:
+ * - preset (Price options preset name)
+ * - products (comma separated sku identifiers)
+ */
+class GroupPriceOptions extends \Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions
+{
+ /**
+ * Get preset array
+ *
+ * @param string $name
+ * @return mixed|null
+ */
+ protected function getPreset($name)
+ {
+ $presets = [
+ 'downloadable_with_tax' => [
+ [
+ 'price' => 20.00,
+ 'website' => 'All Websites [USD]',
+ 'customer_group' => 'General',
+ ],
+ ],
+ ];
+ if (!isset($presets[$name])) {
+ return null;
+ }
+ return $presets[$name];
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
index 65b604c6bb4..53f2d5dc804 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
@@ -73,5 +73,65 @@ class DownloadableProductInjectable extends AbstractRepository
'downloadable_links' => ['preset' => 'with_two_separately_links'],
'checkout_data' => ['preset' => 'with_two_bought_links'],
];
+ $this->_data['with_two_separately_links_special_price_and_category'] = [
+ 'name' => 'Downloadable product %isolation%',
+ 'sku' => 'downloadable_product_%isolation%',
+ 'type_id' => 'downloadable',
+ 'url_key' => 'downloadable-product-%isolation%',
+ 'price' => ['value' => '30'],
+ 'special_price' => '20',
+ 'tax_class_id' => ['dataSet' => 'Taxable Goods'],
+ 'quantity_and_stock_status' => [
+ 'qty' => 1111,
+ 'is_in_stock' => 'In Stock'
+ ],
+ 'status' => 'Product online',
+ 'category_ids' => ['presets' => 'default'],
+ 'visibility' => 'Catalog, Search',
+ 'is_virtual' => 'Yes',
+ 'website_ids' => ['Main Website'],
+ 'downloadable_links' => ['preset' => 'with_two_separately_links'],
+ 'checkout_data' => ['preset' => 'with_two_separately_links']
+ ];
+ $this->_data['with_two_separately_links_group_price_and_category'] = [
+ 'name' => 'Downloadable product %isolation%',
+ 'sku' => 'downloadable_product_%isolation%',
+ 'type_id' => 'downloadable',
+ 'url_key' => 'downloadable-product-%isolation%',
+ 'price' => ['value' => '30'],
+ 'group_price' => ['preset' => 'downloadable_with_tax'],
+ 'tax_class_id' => ['dataSet' => 'Taxable Goods'],
+ 'quantity_and_stock_status' => [
+ 'qty' => 1111,
+ 'is_in_stock' => 'In Stock'
+ ],
+ 'status' => 'Product online',
+ 'category_ids' => ['presets' => 'default'],
+ 'visibility' => 'Catalog, Search',
+ 'is_virtual' => 'Yes',
+ 'website_ids' => ['Main Website'],
+ 'downloadable_links' => ['preset' => 'with_two_separately_links'],
+ 'checkout_data' => ['preset' => 'with_two_separately_links']
+ ];
+ $this->_data['with_two_separately_links_custom_options_and_category'] = [
+ 'name' => 'Downloadable product %isolation%',
+ 'sku' => 'downloadable_product_%isolation%',
+ 'type_id' => 'downloadable',
+ 'url_key' => 'downloadable-product-%isolation%',
+ 'price' => ['value' => '20'],
+ 'tax_class_id' => ['dataSet' => 'Taxable Goods'],
+ 'quantity_and_stock_status' => [
+ 'qty' => 1111,
+ 'is_in_stock' => 'In Stock'
+ ],
+ 'status' => 'Product online',
+ 'category_ids' => ['presets' => 'default'],
+ 'visibility' => 'Catalog, Search',
+ 'is_virtual' => 'Yes',
+ 'website_ids' => ['Main Website'],
+ 'custom_options' => ['preset' => 'drop_down_with_one_option_percent_price'],
+ 'downloadable_links' => ['preset' => 'with_two_separately_links'],
+ 'checkout_data' => ['preset' => 'one_custom_option_and_downloadable_link']
+ ];
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
new file mode 100644
index 00000000000..bc7d8f9327e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Downloadable\Test\TestCase;
+
+use Magento\Tax\Test\TestCase\TaxCalculationTest;
+
+/**
+ * Test DownloadableTaxCalculationTest
+ *
+ * Test Flow:
+ * Steps:
+ * 1. Log in as default admin user.
+ * 2. Go to Stores > Taxes > Tax Rules.
+ * 3. Click 'Add New Tax Rule' button.
+ * 4. Assign default rates to rule.
+ * 5. Save Tax Rate.
+ * 6. Go to Products > Catalog.
+ * 7. Add new product.
+ * 8. Fill data according to dataset.
+ * 9. Save product.
+ * 10. Go to Stores > Configuration.
+ * 11. Fill Tax configuration according to data set.
+ * 12. Save tax configuration.
+ * 13. Perform all assertions.
+ *
+ * @group Tax_(CS)
+ * @ZephyrId MAGETWO-32076
+ */
+class DownloadableTaxCalculationTest extends TaxCalculationTest
+{
+ //
+}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
new file mode 100644
index 00000000000..b173ea5f5a2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
@@ -0,0 +1,17 @@
+"description";"configData";"product";"salesRule";"catalogRule";"taxRule";"customer/dataSet";"qty";"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_price_excl_tax";"prices/cart_item_price_incl_tax";"prices/cart_item_subtotal_excl_tax";"prices/cart_item_subtotal_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";"issue"
+"Downloadable product with sales rule, customer tax equals store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_exin";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_equals_store_rate";"johndoe_unique";"-";"20.00";"21.65";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"12.45";"";"";"0.87";"10.55";"11.42";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
+"Downloadable product with catalog rule, customer tax greater than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"";"16.26";"";"19.51";"";"19.51";"";"19.51";"";"19.51";"";"";"";"1.51";"18.00";"19.51";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
+"Downloadable product with sales rule, customer tax less than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"20.00";"";"23.00";"";"23.00";"";"23.00";"";"23.00";"";"12.45";"";"";"0.87";"11.42";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";""
+"Downloadable product with catalog rule, customer tax greater than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_exin";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"9.24";"10.01";"12.01";"13.01";"12.01";"13.02";"12.01";"13.02";"12.01";"13.02";"";"";"";"1.01";"12.01";"13.02";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
+"Downloadable product with sales rule, customer tax less than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_incl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"";"19.98";"";"22.98";"";"22.97";"";"22.97";"";"22.97";"10.61";"";"";"1.75";"10.61";"12.36";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
+"Downloadable product with catalog rule, customer tax equals store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_equals_store_rate";"johndoe_unique";"-";"9.24";"";"12.01";"";"12.01";"";"12.01";"";"12.01";"";"";"";"";"0.99";"13.00";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";"MAGETWO-32057"
+
+
+
+
+
+
+
+
+
+
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 b10f5bbe514..d3a31c7be16 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
@@ -25,4 +25,31 @@
<assertDownloadableProductInCustomerWishlistOnBackendGrid module="Magento_Downloadable">
<severity>low</severity>
</assertDownloadableProductInCustomerWishlistOnBackendGrid>
+ <assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax module="Magento_Downloadable">
+ <severeness>high</severeness>
+ </assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax>
+ <assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax module="Magento_Downloadable">
+ <severeness>high</severeness>
+ </assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax>
+ <assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax module="Magento_Downloadable">
+ <severeness>high</severeness>
+ </assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax>
+ <assertTaxCalculationAfterCheckoutDownloadableExcludingTax module="Magento_Downloadable">
+ <severeness>high</severeness>
+ </assertTaxCalculationAfterCheckoutDownloadableExcludingTax>
+ <assertTaxCalculationAfterCheckoutDownloadableIncludingTax module="Magento_Downloadable">
+ <severeness>high</severeness>
+ </assertTaxCalculationAfterCheckoutDownloadableIncludingTax>
+ <assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax module="Magento_Downloadable">
+ <severeness>high</severeness>
+ </assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax>
+ <assertOrderTaxOnBackendDownloadableExcludingTax module="Magento_Downloadable">
+ <severeness>high</severeness>
+ </assertOrderTaxOnBackendDownloadableExcludingTax>
+ <assertOrderTaxOnBackendDownloadableIncludingTax module="Magento_Downloadable">
+ <severeness>high</severeness>
+ </assertOrderTaxOnBackendDownloadableIncludingTax>
+ <assertOrderTaxOnBackendDownloadableExcludingIncludingTax module="Magento_Downloadable">
+ <severeness>high</severeness>
+ </assertOrderTaxOnBackendDownloadableExcludingIncludingTax>
</constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
new file mode 100644
index 00000000000..ce97ab96f36
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+-->
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+ <scenario name="DownloadableTaxCalculationTest" module="Magento_Downloadable">
+ <methods>
+ <method name="test">
+ <steps>
+ <first>setupConfiguration</first>
+ <step name="setupConfiguration" module="Magento_Core">
+ <next>createSalesRule</next>
+ </step>
+ <step name="createSalesRule" module="Magento_SalesRule">
+ <next>createCatalogRule</next>
+ </step>
+ <step name="createCatalogRule" module="Magento_CatalogRule">
+ <next>createTaxRule</next>
+ </step>
+ <step name="createTaxRule" module="Magento_Tax">
+ <next>createProduct</next>
+ </step>
+ <step name="createProduct" module="Magento_Catalog">
+ <next>createCustomer</next>
+ </step>
+ <step name="createCustomer" module="Magento_Customer">
+ <next>loginCustomerOnFrontend</next>
+ </step>
+ <step name="loginCustomerOnFrontend" module="Magento_Customer" />
+ </steps>
+ </method>
+ </methods>
+ </scenario>
+</scenarios>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
index cae80b47c51..afdc7c0ed9f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
@@ -6,6 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm;
use Mtf\Block\Form;
+use Mtf\Client\Element\Locator;
/**
* Class Product
@@ -13,6 +14,91 @@ use Mtf\Block\Form;
*/
class Product extends Form
{
+ /**
+ * Product price excluding tax search mask
+ *
+ * @var string
+ */
+ protected $itemExclTax = '//td[@class="col-price"]/div[@class="price-excl-tax"]/span[@class="price"]';
+
+ /**
+ * Product price including tax search mask
+ *
+ * @var string
+ */
+ protected $itemInclTax = '//td[@class="col-price"]/div[@class="price-incl-tax"]/span[@class="price"]';
+
+ /**
+ * Product price subtotal excluding tax search mask
+ *
+ * @var string
+ */
+ protected $itemSubExclTax = '//td[@class="col-subtotal"]/div[@class="price-excl-tax"]/span[@class="price"]';
+
+ /**
+ * Product price subtotal including tax search mask
+ *
+ * @var string
+ */
+ protected $itemSubInclTax = '//td[@class="col-subtotal"]/div[@class="price-incl-tax"]/span[@class="price"]';
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @return string|null
+ */
+ public function getItemPriceExclTax()
+ {
+ $price = $this->_rootElement->find($this->itemExclTax, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Item price including tax
+ *
+ * @return string|null
+ */
+ public function getItemPriceInclTax()
+ {
+ $price = $this->_rootElement->find($this->itemInclTax, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @return string|null
+ */
+ public function getItemSubExclTax()
+ {
+ $price = $this->_rootElement->find($this->itemSubExclTax, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @return string|null
+ */
+
+ public function getItemSubInclTax()
+ {
+ $price = $this->_rootElement->find($this->itemSubInclTax, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Method that escapes currency symbols
+ *
+ * @param string $price
+ * @return string|null
+ */
+ protected function escapeCurrency($price)
+ {
+ preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+ return (isset($matches[1])) ? $matches[1] : null;
+ }
+
/**
* Fill item product data
*
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
new file mode 100644
index 00000000000..e1e57b8961f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license {license_link}
+ */
+
+namespace Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm;
+
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Invoice totals block
+ */
+class Totals extends Block
+{
+ /**
+ * Grand total search mask
+ *
+ * @var string
+ */
+ protected $grandTotal = '//tr[normalize-space(td)="Grand Total"]//span';
+
+ /**
+ * Grand total excluding tax search mask
+ *
+ * @var string
+ */
+ protected $grandTotalExclTax = '//tr[normalize-space(td)="Grand Total (Excl.Tax)"]//span';
+
+ /**
+ * Grand total including tax search mask
+ *
+ * @var string
+ */
+ protected $grandTotalInclTax = '//tr[normalize-space(td)="Grand Total (Incl.Tax)"]//span';
+
+ /**
+ * Subtotal search mask
+ *
+ * @var string
+ */
+ protected $subtotal = '//tr[normalize-space(td)="Subtotal"]//span';
+
+ /**
+ * Subtotal excluding tax search mask
+ *
+ * @var string
+ */
+ protected $subtotalExclTax = '//tr[normalize-space(td)="Subtotal (Excl.Tax)"]//span';
+
+ /**
+ * Subtotal including tax search mask
+ *
+ * @var string
+ */
+ protected $subtotalInclTax = '//tr[normalize-space(td)="Subtotal (Incl.Tax)"]//span';
+
+ /**
+ * Tax search mask
+ *
+ * @var string
+ */
+ protected $tax = '//tr[normalize-space(td)="Tax"]//span';
+
+ /**
+ * Discount search mask
+ *
+ * @var string
+ */
+ protected $discount = '//tr[normalize-space(td)="Discount"]//span';
+
+ /**
+ * Shipping excluding tax search mask
+ *
+ * @var string
+ */
+ protected $shippingExclTax = '//tr[contains (.,"Shipping") and contains (.,"(Excl.Tax)")]//span';
+
+ /**
+ * Shipping including tax search mask
+ *
+ * @var string
+ */
+ protected $shippingInclTax = '//tr[contains (.,"Shipping") and contains (.,"(Incl.Tax)")]//span';
+
+ /**
+ * Get Grand Total Text
+ *
+ * @return string
+ */
+ public function getGrandTotal()
+ {
+ $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($grandTotal);
+ }
+
+ /**
+ * Get Grand Total Excluding Tax Text
+ *
+ * @return string
+ */
+ public function getGrandTotalExclTax()
+ {
+ $grandTotal = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($grandTotal);
+ }
+
+ /**
+ * Get Grand Total Including Tax Text
+ *
+ * @return string
+ */
+ public function getGrandTotalInclTax()
+ {
+ $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($grandTotal);
+ }
+
+ /**
+ * Get Tax text from Order Totals
+ *
+ * @return string
+ */
+ public function getTax()
+ {
+ $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($tax);
+ }
+
+ /**
+ * Get Tax text from Order Totals
+ *
+ * @return string|null
+ */
+ public function getDiscount()
+ {
+ $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_XPATH);
+ return $discount->isVisible() ? $this->escapeCurrency($discount->getText()) : null;
+ }
+
+ /**
+ * Get Subtotal text
+ *
+ * @return string
+ */
+ public function getSubtotal()
+ {
+ $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($subTotal);
+ }
+
+ /**
+ * Get Subtotal text
+ *
+ * @return string
+ */
+ public function getSubtotalExclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($subTotal);
+ }
+
+ /**
+ * Get Subtotal text
+ *
+ * @return string
+ */
+ public function getSubtotalInclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($subTotal);
+ }
+
+ /**
+ * Get Shipping Excluding tax price text
+ *
+ * @return string|null
+ */
+ public function getShippingInclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->shippingInclTax, Locator::SELECTOR_XPATH);
+ return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+ }
+
+ /**
+ * Get Shipping Including tax price text
+ *
+ * @return string|null
+ */
+ public function getShippingExclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->shippingExclTax, Locator::SELECTOR_XPATH);
+ return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+ }
+
+ /**
+ * Method that escapes currency symbols
+ *
+ * @param string $price
+ * @return string|null
+ */
+ protected function escapeCurrency($price)
+ {
+ preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+ return (isset($matches[1])) ? $matches[1] : null;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
index d3bd69d03a0..3ffa76d1e47 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
@@ -42,6 +42,13 @@ class Grid extends GridInterface
*/
protected $editLink = 'td[class*=col-action] a';
+ /**
+ * First row selector
+ *
+ * @var string
+ */
+ protected $firstRowSelector = '//tbody/tr[1]//a';
+
/**
* {@inheritdoc}
*/
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form.php
index d7931b7c648..586ce942ea4 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form.php
@@ -26,7 +26,7 @@ class Form extends AbstractForm
*
* @return Items
*/
- protected function getItemsBlock()
+ public function getItemsBlock()
{
return $this->blockFactory->create(
'Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form\Items',
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
index 32f2d54254c..819c75229fa 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
@@ -5,14 +5,13 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice;
-use Mtf\Block\Block;
use Mtf\Client\Element\Locator;
/**
* Class Totals
* Invoice totals block
*/
-class Totals extends Block
+class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Totals
{
/**
* Submit invoice button selector
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index cff130c94a3..88b5b445d3f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
@@ -5,43 +5,10 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
-
/**
- * Class Totals
* Order totals block
- *
*/
-class Totals extends Block
+class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Totals
{
- /**
- * Grand total search mask
- *
- * @var string
- */
- protected $grandTotal = '//tr[normalize-space(td)="Grand Total"]//span';
-
- /**
- * Get Grand Total Text
- *
- * @return array|string
- */
- public function getGrandTotal()
- {
- $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText();
- return $this->escapeCurrency($grandTotal);
- }
-
- /**
- * Method that escapes currency symbols
- *
- * @param string $price
- * @return string|null
- */
- protected function escapeCurrency($price)
- {
- preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
- return (isset($matches[1])) ? $matches[1] : null;
- }
+ //
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
index d70210c7c11..85b4c41ee09 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
@@ -23,6 +23,36 @@ class Items extends Block
*/
protected $priceSelector = '//div[@class="price-excl-tax"]//span[@class="price"]';
+ // @codingStandardsIgnoreStart
+ /**
+ * Product price excluding tax search mask
+ *
+ * @var string
+ */
+ protected $itemExclTax = '//tr[contains (.,"%s")]/td[@class="col-price"]/div[@class="price-excl-tax"]/span[@class="price"]';
+
+ /**
+ * Product price including tax search mask
+ *
+ * @var string
+ */
+ protected $itemInclTax = '//tr[contains (.,"%s")]/td[@class="col-price"]/div[@class="price-incl-tax"]/span[@class="price"]';
+
+ /**
+ * Product price subtotal excluding tax search mask
+ *
+ * @var string
+ */
+ protected $itemSubExclTax = '//tr[contains (.,"%s")]/td[@class="col-subtotal"]/div[@class="price-excl-tax"]/span[@class="price"]';
+
+ /**
+ * Product price subtotal including tax search mask
+ *
+ * @var string
+ */
+ protected $itemSubInclTax = '//tr[contains (.,"%s")]/td[@class="col-subtotal"]/div[@class="price-incl-tax"]/span[@class="price"]';
+ // @codingStandardsIgnoreEnd
+
/**
* Returns the item price for the specified product.
*
@@ -52,4 +82,68 @@ class Items extends Block
return $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->getText();
}
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @param string $productName
+ * @return string|null
+ */
+ public function getItemPriceExclTax($productName)
+ {
+ $locator = sprintf($this->itemExclTax, $productName);
+ $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Item price including tax
+ *
+ * @param string $productName
+ * @return string|null
+ */
+ public function getItemPriceInclTax($productName)
+ {
+ $locator = sprintf($this->itemInclTax, $productName);
+ $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @param string $productName
+ * @return string|null
+ */
+ public function getItemSubExclTax($productName)
+ {
+ $locator = sprintf($this->itemSubExclTax, $productName);
+ $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @param string $productName
+ * @return string|null
+ */
+ public function getItemSubInclTax($productName)
+ {
+ $locator = sprintf($this->itemSubInclTax, $productName);
+ $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Method that escapes currency symbols
+ *
+ * @param string $price
+ * @return string|null
+ */
+ protected function escapeCurrency($price)
+ {
+ preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+ return (isset($matches[1])) ? $matches[1] : null;
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
index cb7a16398d8..e230d1ab368 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
@@ -35,6 +35,99 @@ class View extends Block
*/
protected $link = '//*[contains(@class,"order-links")]//a[normalize-space(.)="%s"]';
+ /**
+ * Grand total search mask
+ *
+ * @var string
+ */
+ protected $grandTotal = '.grand_total span';
+
+ /**
+ * Grand total including tax search mask
+ *
+ * @var string
+ */
+ protected $grandTotalInclTax = '.grand_total_incl span';
+
+ /**
+ * Subtotal search mask
+ *
+ * @var string
+ */
+ protected $subtotal = '.subtotal .amount span';
+
+ /**
+ * Subtotal excluding tax search mask
+ *
+ * @var string
+ */
+ protected $subtotalExclTax = '.subtotal_excl span';
+
+ /**
+ * Subtotal including tax search mask
+ *
+ * @var string
+ */
+ protected $subtotalInclTax = '.subtotal_incl span';
+
+ /**
+ * Tax search mask
+ *
+ * @var string
+ */
+ protected $tax = '.totals-tax span';
+
+ /**
+ * Discount search mask
+ *
+ * @var string
+ */
+ protected $discount = '.discount span';
+
+ /**
+ * Shipping search mask
+ *
+ * @var string
+ */
+ protected $shippingExclTax = '.shipping span';
+
+ /**
+ * Shipping search mask
+ *
+ * @var string
+ */
+ protected $shippingInclTax = '.shipping_incl span';
+
+ /**
+ * Product price excluding tax search mask
+ *
+ * @var string
+ */
+ protected $itemExclTax = '//tr[contains (.,"%s")]/td[@class="col price"]/span[@class="price-excluding-tax"]/span';
+
+ /**
+ * Product price including tax search mask
+ *
+ * @var string
+ */
+ protected $itemInclTax = '//tr[contains (.,"%s")]/td[@class="col price"]/span[@class="price-including-tax"]/span';
+
+ // @codingStandardsIgnoreStart
+ /**
+ * Product price subtotal excluding tax search mask
+ *
+ * @var string
+ */
+ protected $itemSubExclTax = '//tr[contains (.,"%s")]/td[@class="col subtotal"]/span[@class="price-excluding-tax"]/span';
+
+ /**
+ * Product price subtotal including tax search mask
+ *
+ * @var string
+ */
+ protected $itemSubInclTax = '//tr[contains (.,"%s")]/td[@class="col subtotal"]/span[@class="price-including-tax"]/span';
+ // @codingStandardsIgnoreEnd
+
/**
* Get item block
*
@@ -60,4 +153,167 @@ class View extends Block
{
$this->_rootElement->find(sprintf($this->link, $name), Locator::SELECTOR_XPATH)->click();
}
+
+ /**
+ * Get Grand Total Text
+ *
+ * @return string
+ */
+ public function getGrandTotal()
+ {
+ $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_CSS)->getText();
+ return $this->escapeCurrency($grandTotal);
+ }
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @param string $productName
+ * @return string|null
+ */
+ public function getItemPriceExclTax($productName)
+ {
+ $locator = sprintf($this->itemExclTax, $productName);
+ $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @param string $productName
+ * @return string|null
+ */
+ public function getItemPriceInclTax($productName)
+ {
+ $locator = sprintf($this->itemInclTax, $productName);
+ $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @param string $productName
+ * @return string|null
+ */
+ public function getItemSubExclTax($productName)
+ {
+ $locator = sprintf($this->itemSubExclTax, $productName);
+ $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Item price excluding tax
+ *
+ * @param string $productName
+ * @return string|null
+ */
+ public function getItemSubInclTax($productName)
+ {
+ $locator = sprintf($this->itemSubInclTax, $productName);
+ $price = $this->_rootElement->find($locator, Locator::SELECTOR_XPATH);
+ return $price->isVisible() ? $this->escapeCurrency($price->getText()) : null;
+ }
+
+ /**
+ * Get Grand Total Text
+ *
+ * @return string|null
+ */
+ public function getGrandTotalInclTax()
+ {
+ $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS)->getText();
+ return $this->escapeCurrency($grandTotal);
+ }
+
+ /**
+ * Get Tax text from Order Totals
+ *
+ * @return string
+ */
+ public function getTax()
+ {
+ $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_CSS)->getText();
+ return $this->escapeCurrency($tax);
+ }
+
+ /**
+ * Get Tax text from Order Totals
+ *
+ * @return string|null
+ */
+ public function getDiscount()
+ {
+ $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_CSS);
+ return $discount->isVisible() ? $this->escapeCurrency($discount->getText()) : null;
+ }
+
+ /**
+ * Get Subtotal text
+ *
+ * @return string
+ */
+ public function getSubtotal()
+ {
+ $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_CSS)->getText();
+ return $this->escapeCurrency($subTotal);
+ }
+
+ /**
+ * Get Subtotal text
+ *
+ * @return string
+ */
+ public function getSubtotalExclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_CSS)->getText();
+ return $this->escapeCurrency($subTotal);
+ }
+
+ /**
+ * Get Subtotal text
+ *
+ * @return string
+ */
+ public function getSubtotalInclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_CSS)->getText();
+ return $this->escapeCurrency($subTotal);
+ }
+
+ /**
+ * Get Shipping Excluding tax price text
+ *
+ * @return string|null
+ */
+ public function getShippingInclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->shippingInclTax, Locator::SELECTOR_CSS);
+ return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+ }
+
+ /**
+ * Get Shipping Including tax price text
+ *
+ * @return string|null
+ */
+ public function getShippingExclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->shippingExclTax, Locator::SELECTOR_CSS);
+ return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+ }
+
+ /**
+ * Method that escapes currency symbols
+ *
+ * @param string $price
+ * @return string|null
+ */
+ protected function escapeCurrency($price)
+ {
+ preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+ return (isset($matches[1])) ? $matches[1] : null;
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml
index 4dc2f4dec9a..5091b94e8d1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreditMemoNew.xml
@@ -16,5 +16,10 @@
<locator>#edit_form</locator>
<strategy>css selector</strategy>
</formBlock>
+ <totalsBlock>
+ <class>Magento\Sales\Test\Block\Adminhtml\Order\Creditmemo\Totals</class>
+ <locator>.creditmemo-totals</locator>
+ <strategy>css selector</strategy>
+ </totalsBlock>
</blocks>
</page>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
new file mode 100644
index 00000000000..aa48b9bf01c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Page\Adminhtml\OrderView;
+use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
+use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceNew;
+use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew;
+use Mtf\Fixture\InjectableFixture;
+
+/**
+ * Checks that prices displayed excluding tax in order are correct on backend.
+ */
+abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
+{
+ /**
+ * Order View Page.
+ *
+ * @var OrderView
+ */
+ protected $orderView;
+
+ /**
+ * Order View Page.
+ *
+ * @var OrderInvoiceNew
+ */
+ protected $orderInvoiceNew;
+
+ /**
+ * Order View Page.
+ *
+ * @var OrderCreditMemoNew
+ */
+ protected $orderCreditMemoNew;
+
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that specified prices are actual on order, invoice and refund pages.
+ *
+ * @param array $prices
+ * @param InjectableFixture $product
+ * @param OrderIndex $orderIndex ,
+ * @param OrderView $orderView
+ * @param OrderInvoiceNew $orderInvoiceNew
+ * @param OrderCreditMemoNew $orderCreditMemoNew
+ * @return void
+ */
+ public function processAssert(
+ array $prices,
+ InjectableFixture $product,
+ OrderIndex $orderIndex,
+ OrderView $orderView,
+ OrderInvoiceNew $orderInvoiceNew,
+ OrderCreditMemoNew $orderCreditMemoNew
+ ) {
+ $this->orderView = $orderView;
+ $this->orderInvoiceNew = $orderInvoiceNew;
+ $this->orderCreditMemoNew = $orderCreditMemoNew;
+ $orderIndex->open();
+ $orderIndex->getSalesOrderGrid()->openFirstRow();
+ //Check prices on order page
+ $actualPrices = [];
+ $actualPrices = $this->getOrderPrices($actualPrices, $product);
+ $actualPrices = $this->getOrderTotals($actualPrices);
+ $prices = $this->preparePrices($prices);
+ $message = 'Prices on order view page should be equal to defined in dataset.';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+ $orderView->getPageActions()->invoice();
+ //Check prices on invoice creation page
+ $actualPrices = [];
+ $actualPrices = $this->getInvoiceNewPrices($actualPrices, $product);
+ $actualPrices = $this->getInvoiceNewTotals($actualPrices);
+ $message = 'Prices on invoice new page should be equal to defined in dataset.';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+ $orderInvoiceNew->getTotalsBlock()->submit();
+ //Check prices after invoice on order page
+ $actualPrices = [];
+ $actualPrices = $this->getOrderPrices($actualPrices, $product);
+ $actualPrices = $this->getOrderTotals($actualPrices);
+ $message = 'Prices on invoice page should be equal to defined in dataset.';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+ $orderView->getPageActions()->orderCreditMemo();
+ //Check prices on credit memo creation page
+ $pricesCreditMemo = $this->preparePricesCreditMemo($prices);
+ $actualPrices = [];
+ $actualPrices = $this->getCreditMemoNewPrices($actualPrices, $product);
+ $actualPrices = $this->getCreditMemoNewTotals($actualPrices);
+ $message = 'Prices on credit memo new page should be equal to defined in dataset.';
+ \PHPUnit_Framework_Assert::assertEquals($pricesCreditMemo, $actualPrices, $message);
+ $orderCreditMemoNew->getFormBlock()->submit();
+ //Check prices after refund on order page
+ $actualPrices = [];
+ $actualPrices = $this->getOrderPrices($actualPrices, $product);
+ $actualPrices = $this->getOrderTotals($actualPrices);
+ $message = 'Prices on credit memo page should be equal to defined in dataset.';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+ }
+
+ /**
+ * Unset category and product page expected prices.
+ *
+ * @param array $prices
+ * @return array
+ */
+ protected function preparePrices($prices)
+ {
+ if (isset($prices['category_price_excl_tax'])) {
+ unset($prices['category_price_excl_tax']);
+ }
+ if (isset($prices['category_price_incl_tax'])) {
+ unset($prices['category_price_incl_tax']);
+ }
+ if (isset($prices['product_view_price_excl_tax'])) {
+ unset($prices['product_view_price_excl_tax']);
+ }
+ if (isset($prices['product_view_price_incl_tax'])) {
+ unset($prices['product_view_price_incl_tax']);
+ }
+ return $prices;
+ }
+
+ /**
+ * Unset category and product page expected prices.
+ *
+ * @param array $prices
+ * @return array
+ */
+ protected function preparePricesCreditMemo($prices)
+ {
+ $prices['shipping_excl_tax'] = null;
+ $prices['shipping_incl_tax'] = null;
+ return $prices;
+ }
+
+ /**
+ * Get order product prices.
+ *
+ * @param InjectableFixture $product
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderPrices($actualPrices, InjectableFixture $product)
+ {
+ $viewBlock = $this->orderView->getItemsOrderedBlock();
+ $actualPrices['cart_item_price_excl_tax'] = $viewBlock->getItemPriceExclTax($product->getName());
+ $actualPrices['cart_item_price_incl_tax'] = $viewBlock->getItemPriceInclTax($product->getName());
+ $actualPrices['cart_item_subtotal_excl_tax'] = $viewBlock->getItemSubExclTax($product->getName());
+ $actualPrices['cart_item_subtotal_incl_tax'] = $viewBlock->getItemSubInclTax($product->getName());
+ return $actualPrices;
+ }
+
+ /**
+ * Get invoice new product prices.
+ *
+ * @param InjectableFixture $product
+ * @param $actualPrices
+ * @return array
+ */
+ public function getInvoiceNewPrices($actualPrices, InjectableFixture $product)
+ {
+ $productBlock = $this->orderInvoiceNew->getFormBlock()->getItemsBlock()->getItemProductBlock($product);
+ $actualPrices['cart_item_price_excl_tax'] = $productBlock->getItemPriceExclTax();
+ $actualPrices['cart_item_price_incl_tax'] = $productBlock->getItemPriceInclTax();
+ $actualPrices['cart_item_subtotal_excl_tax'] = $productBlock->getItemSubExclTax();
+ $actualPrices['cart_item_subtotal_incl_tax'] = $productBlock->getItemSubInclTax();
+ return $actualPrices;
+ }
+
+ /**
+ * Get Credit Memo new product prices.
+ *
+ * @param InjectableFixture $product
+ * @param $actualPrices
+ * @return array
+ */
+ public function getCreditMemoNewPrices($actualPrices, InjectableFixture $product)
+ {
+ $productBlock = $this->orderCreditMemoNew->getFormBlock()->getItemsBlock()->getItemProductBlock($product);
+ $actualPrices['cart_item_price_excl_tax'] = $productBlock->getItemPriceExclTax();
+ $actualPrices['cart_item_price_incl_tax'] = $productBlock->getItemPriceInclTax();
+ $actualPrices['cart_item_subtotal_excl_tax'] = $productBlock->getItemSubExclTax();
+ $actualPrices['cart_item_subtotal_incl_tax'] = $productBlock->getItemSubInclTax();
+ return $actualPrices;
+ }
+
+ /**
+ * Text of price verification after order creation.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Prices on backend after order creation is correct.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
new file mode 100644
index 00000000000..e83ccc15583
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
+use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Sales\Test\Page\OrderView;
+use Mtf\Fixture\InjectableFixture;
+
+/**
+ * Checks that prices excluding tax on order review and customer order pages are equal to specified in dataset.
+ */
+abstract class AbstractAssertTaxCalculationAfterCheckout extends AbstractConstraint
+{
+ /**
+ * Checkout page.
+ *
+ * @var CheckoutOnepage
+ */
+ protected $checkoutOnepage;
+
+ /**
+ * Order view page.
+ *
+ * @var OrderView
+ */
+ protected $orderView;
+
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that prices on order review and customer order pages are equal to specified in dataset.
+ *
+ * @param array $prices
+ * @param InjectableFixture $product
+ * @param CheckoutCart $checkoutCart
+ * @param CheckoutOnepage $checkoutOnepage
+ * @param CheckoutOnepageSuccess $checkoutOnepageSuccess
+ * @param OrderView $orderView
+ * @return void
+ */
+ public function processAssert(
+ array $prices,
+ InjectableFixture $product,
+ CheckoutCart $checkoutCart,
+ CheckoutOnepage $checkoutOnepage,
+ CheckoutOnepageSuccess $checkoutOnepageSuccess,
+ OrderView $orderView
+ ) {
+ $this->checkoutOnepage = $checkoutOnepage;
+ $this->orderView = $orderView;
+
+ $checkoutCart->getProceedToCheckoutBlock()->proceedToCheckout();
+ $checkoutOnepage->getBillingBlock()->clickContinue();
+ $shippingMethod = ['shipping_service' => 'Flat Rate', 'shipping_method' => 'Fixed'];
+ $checkoutOnepage->getShippingMethodBlock()->selectShippingMethod($shippingMethod);
+ $checkoutOnepage->getShippingMethodBlock()->clickContinue();
+ $checkoutOnepage->getPaymentMethodsBlock()->selectPaymentMethod(['method' => 'check_money_order']);
+ $checkoutOnepage->getPaymentMethodsBlock()->clickContinue();
+ $actualPrices = [];
+ $actualPrices = $this->getReviewPrices($actualPrices, $product);
+ $actualPrices = $this->getReviewTotals($actualPrices);
+ $prices = $this->preparePrices($prices);
+ //Order review prices verification
+ $message = 'Prices on order review should be equal to defined in dataset.';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+
+ $checkoutOnepage->getReviewBlock()->placeOrder();
+ $checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId();
+ $checkoutOnepageSuccess->getSuccessBlock()->openOrder();
+ $actualPrices = [];
+ $actualPrices = $this->getOrderPrices($actualPrices, $product);
+ $actualPrices = $this->getOrderTotals($actualPrices);
+
+ //Frontend order prices verification
+ $message = 'Prices on order view page should be equal to defined in dataset.';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
+ }
+
+ /**
+ * Prepare expected prices prices.
+ *
+ * @param array $prices
+ * @return array $prices
+ */
+ protected function preparePrices($prices)
+ {
+ if (isset($prices['category_price_excl_tax'])) {
+ unset($prices['category_price_excl_tax']);
+ }
+ if (isset($prices['category_price_incl_tax'])) {
+ unset($prices['category_price_incl_tax']);
+ }
+ if (isset($prices['product_view_price_excl_tax'])) {
+ unset($prices['product_view_price_excl_tax']);
+ }
+ if (isset($prices['product_view_price_incl_tax'])) {
+ unset($prices['product_view_price_incl_tax']);
+ }
+ return $prices;
+ }
+
+ /**
+ * Get review product prices.
+ *
+ * @param InjectableFixture $product
+ * @param $actualPrices
+ * @return array
+ */
+ public function getReviewPrices($actualPrices, InjectableFixture $product)
+ {
+ $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+ $actualPrices['cart_item_price_excl_tax'] = $reviewBlock->getItemPriceExclTax($product->getName());
+ $actualPrices['cart_item_price_incl_tax'] = $reviewBlock->getItemPriceInclTax($product->getName());
+ $actualPrices['cart_item_subtotal_excl_tax'] = $reviewBlock->getItemSubExclTax($product->getName());
+ $actualPrices['cart_item_subtotal_incl_tax'] = $reviewBlock->getItemSubInclTax($product->getName());
+ return $actualPrices;
+ }
+
+ /**
+ * Get order product prices.
+ *
+ * @param InjectableFixture $product
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderPrices($actualPrices, InjectableFixture $product)
+ {
+ $viewBlock = $this->orderView->getOrderViewBlock();
+ $actualPrices['cart_item_price_excl_tax'] = $viewBlock->getItemPriceExclTax($product->getName());
+ $actualPrices['cart_item_price_incl_tax'] = $viewBlock->getItemPriceInclTax($product->getName());
+ $actualPrices['cart_item_subtotal_excl_tax'] = $viewBlock->getItemSubExclTax($product->getName());
+ $actualPrices['cart_item_subtotal_incl_tax'] = $viewBlock->getItemSubInclTax($product->getName());
+ return $actualPrices;
+ }
+
+ /**
+ * Text of price verification after order creation
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Prices on front after order creation is correct.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
similarity index 54%
rename from dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
rename to dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
index ac4a53f3f31..6eb167d44c4 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
@@ -5,58 +5,61 @@
namespace Magento\Tax\Test\Constraint;
-use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Cms\Test\Page\CmsIndex;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureFactory;
+use Mtf\Fixture\InjectableFixture;
/**
- * Class AssertTaxRuleIsAppliedToAllPrice
- * Checks that prices on category, product and cart pages are equal to specified in dataset
+ * Checks that prices excl tax on category, product and cart pages are equal to specified in dataset.
*/
-class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
+abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
{
- /* tags */
- const SEVERITY = 'high';
- /* end tags */
-
/**
- * Cms index page
+ * Cms index page.
*
* @var CmsIndex
*/
protected $cmsIndex;
/**
- * Catalog product page
+ * Catalog product page.
*
* @var catalogCategoryView
*/
protected $catalogCategoryView;
/**
- * Catalog product page
+ * Catalog product page.
*
* @var CatalogProductView
*/
protected $catalogProductView;
/**
- * Catalog product page
+ * Catalog product page.
*
* @var CheckoutCart
*/
protected $checkoutCart;
/**
- * Assert that specified prices are actual on category, product and cart pages
+ * Constraint severeness.
*
- * @param CatalogProductSimple $product
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Assert that specified prices are actual on category, product and cart pages.
+ *
+ * @param InjectableFixture $product
* @param array $prices
+ * @param int $qty
* @param CmsIndex $cmsIndex
* @param CatalogCategoryView $catalogCategoryView
* @param CatalogProductView $catalogProductView
@@ -65,8 +68,9 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
* @return void
*/
public function processAssert(
- CatalogProductSimple $product,
+ InjectableFixture $product,
array $prices,
+ $qty,
CmsIndex $cmsIndex,
CatalogCategoryView $catalogCategoryView,
CatalogProductView $catalogProductView,
@@ -80,98 +84,60 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
//Preconditions
$address = $fixtureFactory->createByCode('addressInjectable', ['dataSet' => 'US_address_NY']);
$shipping = ['carrier' => 'Flat Rate', 'method' => 'Fixed'];
-
+ $actualPrices = [];
//Assertion steps
$productName = $product->getName();
- $this->openCategory($product);
- $actualPrices = [];
+ $productCategory = $product->getCategoryIds()[0];
+ $this->openCategory($productCategory);
$actualPrices = $this->getCategoryPrices($productName, $actualPrices);
$catalogCategoryView->getListProductBlock()->openProductViewPage($productName);
+ $catalogProductView->getViewBlock()->fillOptions($product);
$actualPrices = $this->getProductPagePrices($actualPrices);
- $catalogProductView->getViewBlock()->setQtyAndClickAddToCart(3);
- $actualPrices = $this->getCartPrices($product, $actualPrices);
+ $catalogProductView->getViewBlock()->setQtyAndClickAddToCart($qty);
$this->fillEstimateBlock($address, $shipping);
+ $actualPrices = $this->getCartPrices($product, $actualPrices);
$actualPrices = $this->getTotals($actualPrices);
-
//Prices verification
- \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, 'Arrays should be equal');
+ $message = 'Prices from dataset should be equal to prices on frontend.';
+ \PHPUnit_Framework_Assert::assertEquals($prices, $actualPrices, $message);
}
/**
- * Open product category
+ * Open product category.
*
- * @param CatalogProductSimple $product
+ * @param string $productCategory
* @return void
*/
- public function openCategory(CatalogProductSimple $product)
+ public function openCategory($productCategory)
{
$this->cmsIndex->open();
- $this->cmsIndex->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]);
+ $this->cmsIndex->getTopmenu()->selectCategoryByName($productCategory);
}
- /**
- * Get prices on category page
- *
- * @param $productName
- * @param array $actualPrices
- * @return array
- */
- public function getCategoryPrices($productName, $actualPrices)
- {
- $actualPrices['category_price_excl_tax'] =
- $this->catalogCategoryView
- ->getListProductBlock()
- ->getProductPriceBlock($productName)
- ->getPriceExcludingTax();
- $actualPrices['category_price_incl_tax'] =
- $this->catalogCategoryView
- ->getListProductBlock()
- ->getProductPriceBlock($productName)
- ->getPriceIncludingTax();
- return $actualPrices;
- }
/**
- * Get product view prices
+ * Get cart prices.
*
+ * @param InjectableFixture $product
* @param $actualPrices
* @return array
*/
- public function getProductPagePrices($actualPrices)
+ public function getCartPrices(InjectableFixture $product, $actualPrices)
{
- $actualPrices['product_view_price_excl_tax'] =
- $this->catalogProductView
- ->getViewBlock()
- ->getProductPriceExcludingTax();
- $actualPrices['product_view_price_incl_tax'] =
- $this->catalogProductView
- ->getViewBlock()
- ->getProductPriceIncludingTax();
- return $actualPrices;
- }
-
- /**
- * Get cart prices
- *
- * @param CatalogProductSimple $product
- * @param $actualPrices
- * @return array
- */
- public function getCartPrices(CatalogProductSimple $product, $actualPrices)
- {
- $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();
+ $actualPrices['cart_item_subtotal_excl_tax'] =
+ $this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPrice();
+ $actualPrices['cart_item_subtotal_incl_tax'] =
+ $this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPriceInclTax();
+
return $actualPrices;
}
/**
- * Fill estimate block
+ * Fill estimate block.
*
* @param AddressInjectable $address
* @param array $shipping
@@ -183,27 +149,6 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
$this->checkoutCart->getShippingBlock()->selectShippingMethod($shipping);
}
- /**
- * Get totals
- *
- * @param $actualPrices
- * @return array
- */
- public function getTotals($actualPrices)
- {
- $actualPrices['subtotal_excl_tax'] = $this->checkoutCart->getTotalsBlock()->getSubtotalExcludingTax();
- $actualPrices['subtotal_incl_tax'] = $this->checkoutCart->getTotalsBlock()->getSubtotalIncludingTax();
- $actualPrices['discount'] = $this->checkoutCart->getTotalsBlock()->getDiscount();
- $actualPrices['shipping_excl_tax'] = $this->checkoutCart->getTotalsBlock()->getShippingPrice();
- $actualPrices['shipping_incl_tax'] = $this->checkoutCart->getTotalsBlock()->getShippingPriceInclTax();
- $actualPrices['tax'] = $this->checkoutCart->getTotalsBlock()->getTax();
- $actualPrices['grand_total_excl_tax'] =
- $this->checkoutCart->getTotalsBlock()->getGrandTotalExcludingTax();
- $actualPrices['grand_total_incl_tax'] =
- $this->checkoutCart->getTotalsBlock()->getGrandTotalIncludingTax();
- return $actualPrices;
- }
-
/**
* Text of Tax Rule is applied
*
@@ -211,6 +156,6 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
*/
public function toString()
{
- return 'Prices on front is correct';
+ return 'Prices on front is correct.';
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
index 0dc49a4adda..be4e4cf38d3 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
@@ -166,7 +166,7 @@ abstract class AbstractAssertTaxWithCrossBorderApplying extends AbstractConstrai
$actualPrices['cart_item_subtotal_incl_tax'] =
$this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPriceInclTax();
$actualPrices['grand_total'] =
- $this->checkoutCart->getTotalsBlock()->getGrandTotal();
+ $this->checkoutCart->getTotalsBlock()->getGrandTotalIncludingTax();
return $actualPrices;
}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
new file mode 100644
index 00000000000..35c2ef23572
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices displayed excluding and including tax in order are correct on backend.
+ */
+class AssertOrderTaxOnBackendExcludingIncludingTax extends AbstractAssertOrderTaxOnBackend
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get order totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderTotals($actualPrices)
+ {
+ $viewBlock = $this->orderView->getOrderTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotalExclTax();
+ $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotalInclTax();
+
+ $actualPrices['discount'] = $viewBlock->getDiscount();
+
+ $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $viewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get invoice new totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getInvoiceNewTotals($actualPrices)
+ {
+ $totalsBlock = $this->orderInvoiceNew->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExclTax();
+ $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalInclTax();
+
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get Credit Memo new totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getCreditMemoNewTotals($actualPrices)
+ {
+ $totalsBlock = $this->orderCreditMemoNew->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExclTax();
+ $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalInclTax();
+
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
new file mode 100644
index 00000000000..56a46a082f9
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices including tax in order are correct on backend.
+ */
+class AssertOrderTaxOnBackendExcludingTax extends AbstractAssertOrderTaxOnBackend
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+
+ /**
+ * Get order totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderTotals($actualPrices)
+ {
+ $viewBlock = $this->orderView->getOrderTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotal();
+ $actualPrices['subtotal_incl_tax'] = null;
+
+ $actualPrices['discount'] = $viewBlock->getDiscount();
+
+ $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $viewBlock->getTax();
+
+ $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = null;
+ return $actualPrices;
+ }
+
+ /**
+ * Get invoice new totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getInvoiceNewTotals($actualPrices)
+ {
+ $totalsBlock = $this->orderInvoiceNew->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotal();
+ $actualPrices['subtotal_incl_tax'] = null;
+
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get Credit Memo new totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getCreditMemoNewTotals($actualPrices)
+ {
+ $totalsBlock = $this->orderCreditMemoNew->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotal();
+ $actualPrices['subtotal_incl_tax'] = null;
+
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
new file mode 100644
index 00000000000..71b228adcc3
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices including tax in order are correct on backend.
+ */
+class AssertOrderTaxOnBackendIncludingTax extends AbstractAssertOrderTaxOnBackend
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get order totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderTotals($actualPrices)
+ {
+ $viewBlock = $this->orderView->getOrderTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = null;
+ $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotal();
+
+ $actualPrices['discount'] = $viewBlock->getDiscount();
+
+ $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $viewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get invoice new totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getInvoiceNewTotals($actualPrices)
+ {
+ $totalsBlock = $this->orderInvoiceNew->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = null;
+ $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotal();
+
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get Credit Memo new totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getCreditMemoNewTotals($actualPrices)
+ {
+ $totalsBlock = $this->orderCreditMemoNew->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = null;
+ $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotal();
+
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
new file mode 100644
index 00000000000..29040ace551
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices excl and incl tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutExcludingIncludingTax
+ extends AbstractAssertTaxCalculationAfterCheckout
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get review totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getReviewTotals($actualPrices)
+ {
+ $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+ $actualPrices['subtotal_excl_tax'] = $reviewBlock->getSubtotalExclTax();
+ $actualPrices['subtotal_incl_tax'] = $reviewBlock->getSubtotalInclTax();
+ $actualPrices['discount'] = $reviewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $reviewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $reviewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get order totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderTotals($actualPrices)
+ {
+ $viewBlock = $this->orderView->getOrderViewBlock();
+ $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotalExclTax();
+ $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotalInclTax();
+ $actualPrices['discount'] = $viewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $viewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
new file mode 100644
index 00000000000..dba356b8e41
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices including tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutExcludingTax extends
+ AbstractAssertTaxCalculationAfterCheckout
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get review totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getReviewTotals($actualPrices)
+ {
+ $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+ $actualPrices['subtotal_excl_tax'] = $reviewBlock->getSubtotal();
+ $actualPrices['subtotal_incl_tax'] = null;
+ $actualPrices['discount'] = $reviewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $reviewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get order totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderTotals($actualPrices)
+ {
+ $viewBlock = $this->orderView->getOrderViewBlock();
+ $actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotal();
+ $actualPrices['subtotal_incl_tax'] = null;
+
+ $actualPrices['discount'] = $viewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $viewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
new file mode 100644
index 00000000000..89611a8946d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+/**
+ * Checks that prices including tax on order review and customer order pages are equal to specified in dataset.
+ */
+class AssertTaxCalculationAfterCheckoutIncludingTax extends
+ AbstractAssertTaxCalculationAfterCheckout
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get review totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getReviewTotals($actualPrices)
+ {
+ $reviewBlock = $this->checkoutOnepage->getReviewBlock();
+ $actualPrices['subtotal_excl_tax'] = null;
+ $actualPrices['subtotal_incl_tax'] = $reviewBlock->getSubtotal();
+ $actualPrices['discount'] = $reviewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $reviewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $reviewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $reviewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $reviewBlock->getGrandTotalExclTax();
+ $actualPrices['grand_total_incl_tax'] = $reviewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get order totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getOrderTotals($actualPrices)
+ {
+ $viewBlock = $this->orderView->getOrderViewBlock();
+ $actualPrices['subtotal_excl_tax'] = null;
+ $actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotal();
+ $actualPrices['discount'] = $viewBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $viewBlock->getShippingExclTax();
+ $actualPrices['shipping_incl_tax'] = $viewBlock->getShippingInclTax();
+ $actualPrices['tax'] = $viewBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $viewBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = $viewBlock->getGrandTotalInclTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
new file mode 100644
index 00000000000..a5badd6fd90
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+/**
+ * Checks that prices excl and incl tax on category, product and cart pages are equal to specified in dataset
+ */
+class AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax
+ extends AbstractAssertTaxRuleIsAppliedToAllPrices
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get prices on category page.
+ *
+ * @param $productName
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getCategoryPrices($productName, $actualPrices)
+ {
+ $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+ $actualPrices['category_price_excl_tax'] = $priceBlock->getPriceExcludingTax();
+ $actualPrices['category_price_incl_tax'] = $priceBlock->getPriceIncludingTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get product view prices.
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getProductPagePrices($actualPrices)
+ {
+ $viewBlock = $this->catalogProductView->getViewBlock();
+ $actualPrices['product_view_price_excl_tax'] = $viewBlock->getProductPriceExcludingTax();
+ $actualPrices['product_view_price_incl_tax'] = $viewBlock->getProductPriceIncludingTax();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getTotals($actualPrices)
+ {
+ $totalsBlock = $this->checkoutCart->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExcludingTax();
+ $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalIncludingTax();
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotalExcludingTax();
+ $actualPrices['grand_total_incl_tax'] = $totalsBlock->getGrandTotalIncludingTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
new file mode 100644
index 00000000000..165d6cd23ac
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+
+/**
+ * Checks that prices incl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesExcludingTax extends AbstractAssertTaxRuleIsAppliedToAllPrices
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get prices on category page.
+ *
+ * @param $productName
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getCategoryPrices($productName, $actualPrices)
+ {
+ $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+ $actualPrices['category_price_excl_tax'] = $priceBlock->getEffectivePrice();
+ $actualPrices['category_price_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get product view prices.
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getProductPagePrices($actualPrices)
+ {
+ $viewBlock = $this->catalogProductView->getViewBlock();
+ $actualPrices['product_view_price_excl_tax'] = $viewBlock->getPriceBlock()->getEffectivePrice();
+ $actualPrices['product_view_price_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getTotals($actualPrices)
+ {
+ $totalsBlock = $this->checkoutCart->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotal();
+ $actualPrices['subtotal_incl_tax'] = null;
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+ $actualPrices['grand_total_excl_tax'] = $totalsBlock->getGrandTotal();
+ $actualPrices['grand_total_incl_tax'] = null;
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
new file mode 100644
index 00000000000..ce12c61fbf1
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Tax\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+
+/**
+ * Checks that prices incl tax on category, product and cart pages are equal to specified in dataset.
+ */
+class AssertTaxRuleIsAppliedToAllPricesIncludingTax extends AbstractAssertTaxRuleIsAppliedToAllPrices
+{
+ /**
+ * Constraint severeness.
+ *
+ * @var string
+ */
+ protected $severeness = 'high';
+
+ /**
+ * Get prices on category page.
+ *
+ * @param $productName
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getCategoryPrices($productName, $actualPrices)
+ {
+ $priceBlock = $this->catalogCategoryView->getListProductBlock()->getProductPriceBlock($productName);
+ $actualPrices['category_price_excl_tax'] = null;
+ $actualPrices['category_price_incl_tax'] = $priceBlock->getEffectivePrice();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get product view prices.
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ public function getProductPagePrices($actualPrices)
+ {
+ $viewBlock = $this->catalogProductView->getViewBlock();
+ $actualPrices['product_view_price_excl_tax'] = null;
+ $actualPrices['product_view_price_incl_tax'] = $viewBlock->getPriceBlock()->getEffectivePrice();
+
+ return $actualPrices;
+ }
+
+ /**
+ * Get totals.
+ *
+ * @param $actualPrices
+ * @return array
+ */
+ public function getTotals($actualPrices)
+ {
+ $totalsBlock = $this->checkoutCart->getTotalsBlock();
+ $actualPrices['subtotal_excl_tax'] = null;
+ $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotal();
+ $actualPrices['discount'] = $totalsBlock->getDiscount();
+ $actualPrices['shipping_excl_tax'] = $totalsBlock->getShippingPrice();
+ $actualPrices['shipping_incl_tax'] = $totalsBlock->getShippingPriceInclTax();
+ $actualPrices['tax'] = $totalsBlock->getTax();
+ $actualPrices['subtotal_excl_tax'] = $totalsBlock->getSubtotalExcludingTax();
+ $actualPrices['subtotal_incl_tax'] = $totalsBlock->getSubtotalIncludingTax();
+
+ return $actualPrices;
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
new file mode 100644
index 00000000000..94bc1cd3b81
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license {license_link}
+ */
+
+namespace Magento\Tax\Test\TestStep;
+
+use Mtf\Fixture\FixtureFactory;
+use Mtf\TestStep\TestStepInterface;
+
+/**
+ * Creating tax rule
+ */
+class CreateTaxRuleStep implements TestStepInterface
+{
+ /**
+ * Tax Rule
+ *
+ * @var string
+ */
+ protected $taxRule;
+
+ /**
+ * Factory for Fixture
+ *
+ * @var FixtureFactory
+ */
+ protected $fixtureFactory;
+
+ /**
+ * Preparing step properties
+ *
+ * @constructor
+ * @param FixtureFactory $fixtureFactory
+ * @param string $taxRule
+ */
+ public function __construct(FixtureFactory $fixtureFactory, $taxRule)
+ {
+ $this->fixtureFactory = $fixtureFactory;
+ $this->taxRule = $taxRule;
+ }
+
+ /**
+ * Create tax rule
+ *
+ * @return array
+ */
+ public function run()
+ {
+ $result['taxRule'] = null;
+ if ($this->taxRule != '-') {
+ $taxRule = $this->fixtureFactory->createByCode(
+ 'taxRule',
+ ['dataSet' => $this->taxRule]
+ );
+ $taxRule->persist();
+ $result['taxRule'] = $taxRule;
+ }
+
+ return $result;
+ }
+}
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 f61aa496c07..f44433948ca 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
@@ -56,6 +56,33 @@
<assertTaxRuleIsApplied module="Magento_Tax">
<severity>high</severity>
</assertTaxRuleIsApplied>
+ <assertTaxRuleIsAppliedToAllPricesExcludingTax module="Magento_Tax">
+ <severeness>high</severeness>
+ </assertTaxRuleIsAppliedToAllPricesExcludingTax>
+ <assertTaxRuleIsAppliedToAllPricesIncludingTax module="Magento_Tax">
+ <severeness>high</severeness>
+ </assertTaxRuleIsAppliedToAllPricesIncludingTax>
+ <assertTaxRuleIsAppliedToAllPricesExcludingIncludingTax module="Magento_Tax">
+ <severeness>high</severeness>
+ </assertTaxRuleIsAppliedToAllPricesExcludingIncludingTax>
+ <assertTaxCalculationAfterCheckoutExcludingIncludingTax module="Magento_Tax">
+ <severeness>high</severeness>
+ </assertTaxCalculationAfterCheckoutExcludingIncludingTax>
+ <assertTaxCalculationAfterCheckoutExcludingTax module="Magento_Tax">
+ <severeness>high</severeness>
+ </assertTaxCalculationAfterCheckoutExcludingTax>
+ <assertTaxCalculationAfterCheckoutIncludingTax module="Magento_Tax">
+ <severeness>high</severeness>
+ </assertTaxCalculationAfterCheckoutIncludingTax>
+ <assertOrderTaxOnBackendExcludingIncludingTax module="Magento_Tax">
+ <severeness>high</severeness>
+ </assertOrderTaxOnBackendExcludingIncludingTax>
+ <assertOrderTaxOnBackendIncludingTax module="Magento_Tax">
+ <severeness>high</severeness>
+ </assertOrderTaxOnBackendIncludingTax>
+ <assertOrderTaxOnBackendExcludingTax module="Magento_Tax">
+ <severeness>high</severeness>
+ </assertOrderTaxOnBackendExcludingTax>
<assertTaxRuleIsAppliedToAllPrices module="Magento_Tax">
<severity>high</severity>
</assertTaxRuleIsAppliedToAllPrices>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
new file mode 100644
index 00000000000..a1d4d406e4f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license {license_link}
+ */
+-->
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+ <scenario name="TaxCalculationTest" module="Magento_Checkout">
+ <methods>
+ <method name="test">
+ <steps>
+ <first>setupConfiguration</first>
+ <step name="setupConfiguration" module="Magento_Core">
+ <next>createSalesRule</next>
+ </step>
+ <step name="createSalesRule" module="Magento_SalesRule">
+ <next>createCatalogRule</next>
+ </step>
+ <step name="createCatalogRule" module="Magento_CatalogRule">
+ <next>createTaxRule</next>
+ </step>
+ <step name="createTaxRule" module="Magento_Tax">
+ <next>createProduct</next>
+ </step>
+ <step name="createProduct" module="Magento_Catalog">
+ <next>createCustomer</next>
+ </step>
+ <step name="createCustomer" module="Magento_Customer">
+ <next>loginCustomerOnFrontend</next>
+ </step>
+ <step name="loginCustomerOnFrontend" module="Magento_Customer" />
+ </steps>
+ </method>
+ </methods>
+ </scenario>
+</scenarios>
--
GitLab
From dd9e3f91f36b0af7c1b69a90e109ee30f851d609 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Fri, 26 Dec 2014 15:33:36 +0200
Subject: [PATCH 012/120] MAGETWO-32115: Implement ObjectManager
---
.../lib/Mtf/ObjectManagerFactory.php | 41 +++++++++----------
dev/tests/functional/utils/bootstrap.php | 7 +++-
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
index 6c8be6f8dd8..e41357231db 100644
--- a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
+++ b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
@@ -6,8 +6,8 @@
namespace Mtf;
use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\ObjectManagerInterface as MagentoObjectManager;
-use Magento\Framework\Stdlib\BooleanUtils;
+use Mtf\ObjectManagerInterface as MagentoObjectManager;
+use Mtf\Stdlib\BooleanUtils;
use Mtf\ObjectManager\Factory;
use Mtf\System\Config as SystemConfig;
@@ -53,14 +53,11 @@ class ObjectManagerFactory
}
$diConfig = new $this->configClassName();
- $systemConfig = new SystemConfig();
- $configuration = $systemConfig->getConfigParam();
- $diConfig->extend($configuration);
$factory = new Factory($diConfig);
$argInterpreter = $this->createArgumentInterpreter(new BooleanUtils());
- $argumentMapper = new \Magento\Framework\ObjectManager\Config\Mapper\Dom($argInterpreter);
+ $argumentMapper = new \Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);
- $sharedInstances['Magento\Framework\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
+ $sharedInstances['Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
$objectManager = new $this->locatorClassName($factory, $diConfig, $sharedInstances);
$factory->setObjectManager($objectManager);
@@ -85,35 +82,35 @@ class ObjectManagerFactory
return new \Magento\Framework\App\DeploymentConfig(
new \Magento\Framework\App\DeploymentConfig\Reader($directoryList),
isset($arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE])
- ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
- : null
+ ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
+ : null
);
}
/**
* Return newly created instance on an argument interpreter, suitable for processing DI arguments
*
- * @param \Magento\Framework\Stdlib\BooleanUtils $booleanUtils
- * @return \Magento\Framework\Data\Argument\InterpreterInterface
+ * @param \Mtf\Stdlib\BooleanUtils $booleanUtils
+ * @return \Mtf\Data\Argument\InterpreterInterface
*/
protected function createArgumentInterpreter(
- \Magento\Framework\Stdlib\BooleanUtils $booleanUtils
+ \Mtf\Stdlib\BooleanUtils $booleanUtils
) {
- $constInterpreter = new \Magento\Framework\Data\Argument\Interpreter\Constant();
- $result = new \Magento\Framework\Data\Argument\Interpreter\Composite(
+ $constInterpreter = new \Mtf\Data\Argument\Interpreter\Constant();
+ $result = new \Mtf\Data\Argument\Interpreter\Composite(
[
- 'boolean' => new \Magento\Framework\Data\Argument\Interpreter\Boolean($booleanUtils),
- 'string' => new \Magento\Framework\Data\Argument\Interpreter\String($booleanUtils),
- 'number' => new \Magento\Framework\Data\Argument\Interpreter\Number(),
- 'null' => new \Magento\Framework\Data\Argument\Interpreter\NullType(),
+ 'boolean' => new \Mtf\Data\Argument\Interpreter\Boolean($booleanUtils),
+ 'string' => new \Mtf\Data\Argument\Interpreter\String($booleanUtils),
+ 'number' => new \Mtf\Data\Argument\Interpreter\Number(),
+ 'null' => new \Mtf\Data\Argument\Interpreter\NullType(),
'const' => $constInterpreter,
- 'object' => new \Magento\Framework\Data\Argument\Interpreter\Object($booleanUtils),
- 'init_parameter' => new \Magento\Framework\App\Arguments\ArgumentInterpreter($constInterpreter),
+ 'object' => new \Mtf\Data\Argument\Interpreter\Object($booleanUtils),
+ 'init_parameter' => new \Mtf\Data\Argument\Interpreter\Argument($constInterpreter),
],
- \Magento\Framework\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
+ \Mtf\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
);
// Add interpreters that reference the composite
- $result->addInterpreter('array', new \Magento\Framework\Data\Argument\Interpreter\ArrayType($result));
+ $result->addInterpreter('array', new \Mtf\Data\Argument\Interpreter\ArrayType($result));
return $result;
}
diff --git a/dev/tests/functional/utils/bootstrap.php b/dev/tests/functional/utils/bootstrap.php
index 34492b32b8f..c07502fbf21 100644
--- a/dev/tests/functional/utils/bootstrap.php
+++ b/dev/tests/functional/utils/bootstrap.php
@@ -13,6 +13,9 @@ $appRoot = dirname(dirname(dirname(dirname(__DIR__))));
require $appRoot . '/app/bootstrap.php';
require __DIR__ . '/../vendor/autoload.php';
-$objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-$objectManager = $objectManagerFactory->create($_SERVER);
+
+$objectManager = \Mtf\ObjectManagerFactory::getObjectManager();
+//@TODO Remove below
+//$objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
+//$objectManager = $objectManagerFactory->create($_SERVER);
\Mtf\ObjectManagerFactory::configure($objectManager);
--
GitLab
From 2cb62aac1c64f51b251aa44391ce6228616f7843 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Fri, 26 Dec 2014 15:50:56 +0200
Subject: [PATCH 013/120] MAGETWO-32115: Implement ObjectManager
---
dev/tests/functional/composer.json | 32 ++++++++++++++++++------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index ab4bd87728a..d5fd8645d29 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,16 +1,22 @@
{
- "require": {
- "magento/mtf": "1.0.0-rc10",
- "php": ">=5.4.0",
- "phpunit/phpunit": "4.1.0",
- "phpunit/phpunit-selenium": ">=1.2",
- "netwing/selenium-server-standalone": ">=2.35"
- },
- "autoload": {
- "psr-4": {
- "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
- "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
- "Test\\": "generated/Test/"
- }
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
}
+ ],
+ "require": {
+ "magento/mtf": "dev-MAGETWO-32115",
+ "php": ">=5.4.0",
+ "phpunit/phpunit": "4.1.0",
+ "phpunit/phpunit-selenium": ">=1.2",
+ "netwing/selenium-server-standalone": ">=2.35"
+ },
+ "autoload": {
+ "psr-4": {
+ "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
+ "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+ "Test\\": "generated/Test/"
+ }
+ }
}
--
GitLab
From 8c0837dae3266a00504205622f3074f9ba2cc554 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Fri, 26 Dec 2014 16:26:08 +0200
Subject: [PATCH 014/120] MAGETWO-32115: Implement ObjectManager
---
dev/tests/functional/composer.json | 32 ++++++++++++++++++------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index e2e3d4ad289..d5fd8645d29 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,16 +1,22 @@
{
- "require": {
- "magento/mtf": "1.0.0-rc11",
- "php": ">=5.4.0",
- "phpunit/phpunit": "4.1.0",
- "phpunit/phpunit-selenium": ">=1.2",
- "netwing/selenium-server-standalone": ">=2.35"
- },
- "autoload": {
- "psr-4": {
- "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
- "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
- "Test\\": "generated/Test/"
- }
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
}
+ ],
+ "require": {
+ "magento/mtf": "dev-MAGETWO-32115",
+ "php": ">=5.4.0",
+ "phpunit/phpunit": "4.1.0",
+ "phpunit/phpunit-selenium": ">=1.2",
+ "netwing/selenium-server-standalone": ">=2.35"
+ },
+ "autoload": {
+ "psr-4": {
+ "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
+ "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+ "Test\\": "generated/Test/"
+ }
+ }
}
--
GitLab
From 1d894a4312dfa6856382cf9e2cb2a253ff3cedc1 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Mon, 29 Dec 2014 11:40:46 +0200
Subject: [PATCH 015/120] MAGETWO-32115: Implement ObjectManager
---
dev/tests/functional/lib/Mtf/ObjectManagerFactory.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
index e41357231db..76acdd72b7b 100644
--- a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
+++ b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
@@ -5,11 +5,9 @@
namespace Mtf;
-use Magento\Framework\App\Filesystem\DirectoryList;
use Mtf\ObjectManagerInterface as MagentoObjectManager;
use Mtf\Stdlib\BooleanUtils;
use Mtf\ObjectManager\Factory;
-use Mtf\System\Config as SystemConfig;
/**
* Class ObjectManagerFactory
--
GitLab
From 56a79ede923a443f3538a57fa027a48f064277e7 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Mon, 29 Dec 2014 18:04:08 +0200
Subject: [PATCH 016/120] MAGETWO-32115: Implement ObjectManager
---
dev/tests/functional/lib/Mtf/Util/Generate/Factory.php | 4 ++--
.../lib/Mtf/Util/Generate/Fixture/FieldsProvider.php | 4 ++--
.../lib/Mtf/Util/Generate/Repository/CollectionProvider.php | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php b/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
index a652604eb96..e57ed53ce83 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
@@ -6,7 +6,7 @@
namespace Mtf\Util\Generate;
use Magento\Framework\App;
-use Magento\Framework\ObjectManagerInterface;
+use Mtf\ObjectManagerInterface;
/**
* Class Factory
@@ -17,7 +17,7 @@ use Magento\Framework\ObjectManagerInterface;
class Factory extends AbstractGenerate
{
/**
- * @var \Magento\Framework\ObjectManagerInterface
+ * @var \Mtf\ObjectManagerInterface
*/
protected $objectManager;
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
index fcdd68334a4..882970878db 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
@@ -6,7 +6,7 @@
namespace Mtf\Util\Generate\Fixture;
use Magento\Framework\App\Resource;
-use Magento\Framework\ObjectManagerInterface;
+use Mtf\ObjectManagerInterface;
/**
* Class FieldsProvider
@@ -26,7 +26,7 @@ class FieldsProvider implements FieldsProviderInterface
/**
* @constructor
- * @param \Magento\Framework\ObjectManagerInterface $objectManager
+ * @param \Mtf\ObjectManagerInterface $objectManager
*/
public function __construct(ObjectManagerInterface $objectManager)
{
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
index ce0fcdfbc2f..73230a4a5ba 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
@@ -5,7 +5,7 @@
namespace Mtf\Util\Generate\Repository;
-use Magento\Framework\ObjectManagerInterface;
+use Mtf\ObjectManagerInterface;
/**
* Class CollectionProvider
@@ -14,13 +14,13 @@ use Magento\Framework\ObjectManagerInterface;
class CollectionProvider implements CollectionProviderInterface
{
/**
- * @var \Magento\Framework\ObjectManagerInterface
+ * @var \Mtf\ObjectManagerInterface
*/
protected $objectManager;
/**
* @constructor
- * @param \Magento\Framework\ObjectManagerInterface $objectManager
+ * @param \Mtf\ObjectManagerInterface $objectManager
*/
public function __construct(ObjectManagerInterface $objectManager)
{
--
GitLab
From bcd54a4cf782f0833de3e5b3734881a98f9ac19d Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Mon, 29 Dec 2014 18:18:45 +0200
Subject: [PATCH 017/120] MAGETWO-32115: Implement ObjectManager
---
dev/tests/functional/lib/Mtf/Util/Generate/Factory.php | 4 ++--
.../lib/Mtf/Util/Generate/Fixture/FieldsProvider.php | 4 ++--
.../lib/Mtf/Util/Generate/Repository/CollectionProvider.php | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php b/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
index e57ed53ce83..a652604eb96 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
@@ -6,7 +6,7 @@
namespace Mtf\Util\Generate;
use Magento\Framework\App;
-use Mtf\ObjectManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
/**
* Class Factory
@@ -17,7 +17,7 @@ use Mtf\ObjectManagerInterface;
class Factory extends AbstractGenerate
{
/**
- * @var \Mtf\ObjectManagerInterface
+ * @var \Magento\Framework\ObjectManagerInterface
*/
protected $objectManager;
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
index 882970878db..fcdd68334a4 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
@@ -6,7 +6,7 @@
namespace Mtf\Util\Generate\Fixture;
use Magento\Framework\App\Resource;
-use Mtf\ObjectManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
/**
* Class FieldsProvider
@@ -26,7 +26,7 @@ class FieldsProvider implements FieldsProviderInterface
/**
* @constructor
- * @param \Mtf\ObjectManagerInterface $objectManager
+ * @param \Magento\Framework\ObjectManagerInterface $objectManager
*/
public function __construct(ObjectManagerInterface $objectManager)
{
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
index 73230a4a5ba..ce0fcdfbc2f 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
@@ -5,7 +5,7 @@
namespace Mtf\Util\Generate\Repository;
-use Mtf\ObjectManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
/**
* Class CollectionProvider
@@ -14,13 +14,13 @@ use Mtf\ObjectManagerInterface;
class CollectionProvider implements CollectionProviderInterface
{
/**
- * @var \Mtf\ObjectManagerInterface
+ * @var \Magento\Framework\ObjectManagerInterface
*/
protected $objectManager;
/**
* @constructor
- * @param \Mtf\ObjectManagerInterface $objectManager
+ * @param \Magento\Framework\ObjectManagerInterface $objectManager
*/
public function __construct(ObjectManagerInterface $objectManager)
{
--
GitLab
From 8b1186e23e2523fd9f5965b735222ed794d50a84 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Tue, 30 Dec 2014 11:24:46 +0200
Subject: [PATCH 018/120] MAGETWO-32115: Implement ObjectManager
---
dev/tests/functional/utils/bootstrap.php | 4 ----
1 file changed, 4 deletions(-)
diff --git a/dev/tests/functional/utils/bootstrap.php b/dev/tests/functional/utils/bootstrap.php
index c07502fbf21..2c0a8066139 100644
--- a/dev/tests/functional/utils/bootstrap.php
+++ b/dev/tests/functional/utils/bootstrap.php
@@ -13,9 +13,5 @@ $appRoot = dirname(dirname(dirname(dirname(__DIR__))));
require $appRoot . '/app/bootstrap.php';
require __DIR__ . '/../vendor/autoload.php';
-
$objectManager = \Mtf\ObjectManagerFactory::getObjectManager();
-//@TODO Remove below
-//$objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-//$objectManager = $objectManagerFactory->create($_SERVER);
\Mtf\ObjectManagerFactory::configure($objectManager);
--
GitLab
From 26e1938017f1f12e0669bb96a20e1b5b9280cd70 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Tue, 30 Dec 2014 11:36:35 +0200
Subject: [PATCH 019/120] MAGETWO-32115: Implement ObjectManager
---
dev/tests/functional/composer.json | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index d5fd8645d29..65e0688fc00 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,12 +1,6 @@
{
- "repositories": [
- {
- "type": "vcs",
- "url": "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
- }
- ],
"require": {
- "magento/mtf": "dev-MAGETWO-32115",
+ "magento/mtf": "1.0.0-rc11",
"php": ">=5.4.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
--
GitLab
From 2f0965fe4de535d377ee66af3a009cc208bad4b0 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Tue, 30 Dec 2014 11:57:01 +0200
Subject: [PATCH 020/120] MAGETWO-32115: Implement ObjectManager
---
dev/tests/functional/composer.json | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 65e0688fc00..d5fd8645d29 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,12 @@
{
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
+ }
+ ],
"require": {
- "magento/mtf": "1.0.0-rc11",
+ "magento/mtf": "dev-MAGETWO-32115",
"php": ">=5.4.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
--
GitLab
From 8eb7dcd62e9850259e1a74027ffa62e786cfaeb3 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Tue, 30 Dec 2014 12:58:05 +0200
Subject: [PATCH 021/120] MAGETWO-32115: Implement ObjectManager
---
dev/tests/functional/composer.json | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index d5fd8645d29..65e0688fc00 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,12 +1,6 @@
{
- "repositories": [
- {
- "type": "vcs",
- "url": "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
- }
- ],
"require": {
- "magento/mtf": "dev-MAGETWO-32115",
+ "magento/mtf": "1.0.0-rc11",
"php": ">=5.4.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
--
GitLab
From b104ff2744d551145a766cea3db7816288b459bb Mon Sep 17 00:00:00 2001
From: agurzhyi <agurzhyi@ebay.com>
Date: Tue, 30 Dec 2014 16:12:58 +0200
Subject: [PATCH 022/120] MAGETWO-32079: Alternative WebDriver support
---
dev/tests/functional/composer.json | 13 +++-
.../Element/OptgroupselectElement.php | 55 -----------------
.../Element/ConditionsElement.php | 37 ++++++------
.../Element/DatepickerElement.php | 7 +--
.../Element/GlobalsearchElement.php | 41 +++++++------
.../Element/JquerytreeElement.php | 10 +---
.../Element/LiselectstoreElement.php | 33 +++++------
.../Element/MultiselectgrouplistElement.php | 35 +++++------
.../Element/MultiselectlistElement.php | 26 ++------
.../Element/MultisuggestElement.php | 41 +++++--------
.../Client/Element/OptgroupselectElement.php | 50 ++++++++++++++++
.../Element/SelectstoreElement.php | 20 +++----
.../Selenium => }/Element/SuggestElement.php | 33 +++--------
.../{Driver/Selenium => }/Element/Tree.php | 38 ++++++------
.../Selenium => }/Element/TreeElement.php | 3 +-
.../Util/Generate/Factory/AbstractFactory.php | 3 +-
dev/tests/functional/phpunit.xml.dist | 4 +-
.../Backend/Test/Block/Admin/Login.php | 2 +-
.../app/Magento/Backend/Test/Block/Cache.php | 4 +-
.../app/Magento/Backend/Test/Block/Denied.php | 2 +-
.../Backend/Test/Block/FormPageActions.php | 5 +-
.../Backend/Test/Block/Page/Header.php | 4 +-
.../Backend/Test/Block/System/Config/Form.php | 2 +-
.../Test/Block/System/Config/Form/Group.php | 9 ++-
.../Test/Block/System/Config/PageActions.php | 4 +-
.../Test/Block/System/Store/Delete/Form.php | 6 +-
.../System/Store/Edit/Form/GroupForm.php | 2 +-
.../System/Store/Edit/Form/StoreForm.php | 2 +-
.../Test/Block/System/Store/StoreGrid.php | 2 +-
.../Backend/Test/Block/Widget/Form.php | 2 +-
.../Backend/Test/Block/Widget/FormTabs.php | 26 ++++----
.../Backend/Test/Block/Widget/Grid.php | 13 ++--
.../Magento/Backend/Test/Block/Widget/Tab.php | 18 +++---
.../Backend/Test/Page/AdminAuthLogin.php | 2 +-
.../Catalog/Product/Edit/Tab/Bundle.php | 9 +--
.../Product/Edit/Tab/Bundle/Option.php | 5 +-
.../Test/Block/Catalog/Product/View.php | 3 +-
.../Catalog/Product/View/Type/Bundle.php | 29 ++++-----
.../AssertBundleItemsOnProductPage.php | 6 +-
.../Test/Constraint/AssertBundlePriceType.php | 6 +-
.../Test/Constraint/AssertBundlePriceView.php | 6 +-
.../AssertTierPriceOnBundleProductPage.php | 11 ++--
.../Adminhtml/Category/Edit/Tab/Product.php | 5 +-
.../Test/Block/Adminhtml/Category/Tree.php | 9 ++-
.../Adminhtml/Category/Widget/Chooser.php | 2 +-
.../Product/Attribute/AttributeForm.php | 9 +--
.../Product/Attribute/CustomAttribute.php | 15 ++---
.../Product/Attribute/Edit/AttributeForm.php | 11 ++--
.../Product/Attribute/Edit/Options.php | 12 ++--
.../Product/Attribute/Edit/Tab/Advanced.php | 5 +-
.../Product/Attribute/Edit/Tab/Options.php | 5 +-
.../Adminhtml/Product/Attribute/Set/Main.php | 6 +-
.../Adminhtml/Product/Composite/Configure.php | 7 +--
.../Product/Edit/Action/Attribute.php | 4 +-
.../Product/Edit/AdvancedPricingTab.php | 11 ++--
.../Edit/AdvancedPricingTab/OptionGroup.php | 6 +-
.../Edit/AdvancedPricingTab/OptionTier.php | 6 +-
.../Adminhtml/Product/Edit/ProductTab.php | 2 +-
.../Product/Edit/Tab/AbstractRelated.php | 16 ++---
.../Product/Edit/Tab/Attributes/Search.php | 3 +-
.../Adminhtml/Product/Edit/Tab/Crosssell.php | 6 +-
.../Adminhtml/Product/Edit/Tab/Options.php | 15 +++--
.../Edit/Tab/Options/AbstractOptions.php | 12 ++--
.../Edit/Tab/Options/Type/DropDown.php | 7 ++-
.../Edit/Tab/ProductDetails/AttributeSet.php | 2 +-
.../Edit/Tab/ProductDetails/CategoryIds.php | 4 +-
.../ProductDetails/ProductOnlineSwitcher.php | 6 +-
.../Adminhtml/Product/Edit/Tab/Related.php | 7 ++-
.../Adminhtml/Product/Edit/Tab/Upsell.php | 7 ++-
.../Product/Edit/Tab/Websites/StoreTree.php | 6 +-
.../Adminhtml/Product/FormPageActions.php | 2 +-
.../Adminhtml/Product/GridPageAction.php | 2 +-
.../Block/Adminhtml/Product/ProductForm.php | 17 +++---
.../Catalog/Test/Block/Category/View.php | 5 +-
.../Catalog/Test/Block/Product/Additional.php | 17 +++---
.../Block/Product/Compare/ListCompare.php | 12 ++--
.../Test/Block/Product/Compare/Sidebar.php | 6 +-
.../Product/Grouped/AssociatedProducts.php | 13 ++--
.../ListAssociatedProducts.php | 12 ++--
.../ListAssociatedProducts/Product.php | 3 +
.../AssociatedProducts/Search/Grid.php | 5 +-
.../Test/Block/Product/ListProduct.php | 8 +--
.../Catalog/Test/Block/Product/Price.php | 6 +-
.../Block/Product/ProductList/Crosssell.php | 8 +--
.../Block/Product/ProductList/Related.php | 6 +-
.../Test/Block/Product/ProductList/Upsell.php | 6 +-
.../Catalog/Test/Block/Product/View.php | 2 +-
.../Test/Block/Product/View/CustomOptions.php | 59 ++++++++++---------
.../app/Magento/Catalog/Test/Block/Search.php | 2 +-
.../AssertCategoryAbsenceOnFrontend.php | 11 ++--
.../AssertCategoryForAssignedProducts.php | 11 ++--
.../Constraint/AssertCategoryIsNotActive.php | 6 +-
.../AssertCategoryIsNotIncludeInMenu.php | 6 +-
.../Test/Constraint/AssertCategoryPage.php | 6 +-
.../Constraint/AssertCategoryRedirect.php | 11 ++--
.../AssertCrossSellsProductsSection.php | 6 +-
.../AssertNoCrossSellsProductsSection.php | 6 +-
.../AssertNoRelatedProductsSection.php | 6 +-
.../AssertNoUpSellsProductsSection.php | 6 +-
...rtProductAttributeDisplayingOnFrontend.php | 6 +-
.../AssertProductAttributeIsComparable.php | 6 +-
.../AssertProductAttributeIsHtmlAllowed.php | 6 +-
.../AssertProductCompareBlockOnCmsPage.php | 12 ++--
...ssertProductCustomOptionsOnProductPage.php | 11 ++--
...AssertProductGroupedPriceOnProductPage.php | 11 ++--
.../Test/Constraint/AssertProductInCart.php | 6 +-
.../Test/Constraint/AssertProductInStock.php | 11 ++--
...AssertProductIsNotDisplayingOnFrontend.php | 8 +--
.../Constraint/AssertProductOutOfStock.php | 11 ++--
.../Test/Constraint/AssertProductPage.php | 11 ++--
...AssertProductSpecialPriceOnProductPage.php | 11 ++--
.../AssertProductTierPriceOnProductPage.php | 6 +-
.../Test/Constraint/AssertProductView.php | 8 +--
.../AssertRelatedProductsSection.php | 6 +-
.../AssertUpSellsProductsSection.php | 6 +-
.../Catalog/Test/Fixture/ProductAttribute.php | 2 +-
.../Test/Page/Category/CatalogCategory.php | 2 +-
.../Page/Category/CatalogCategoryEdit.php | 2 +-
.../CatalogProductActionAttributeEdit.php | 2 +-
.../Product/AbstractCompareProductsTest.php | 8 +--
.../TestStep/OpenProductsOnFrontendStep.php | 8 +--
.../Test/Block/Adminhtml/Promo/Catalog.php | 6 +-
.../Promo/Catalog/Edit/PromoForm.php | 5 +-
.../Promo/Catalog/Edit/Tab/Conditions.php | 8 +--
.../CatalogRule/Test/Block/Conditions.php | 2 +-
.../Test/Block/Advanced/Form.php | 13 ++--
.../Test/Block/Advanced/Result.php | 2 +-
...rtSearchSynonymMassActionNotOnFrontend.php | 6 +-
.../AssertSearchSynonymNotOnFrontend.php | 6 +-
...ssertSearchTermMassActionNotOnFrontend.php | 6 +-
.../AssertSearchTermNotOnFrontend.php | 6 +-
.../Constraint/AssertSearchTermOnFrontend.php | 6 +-
.../AssertSearchTermSynonymOnFrontend.php | 6 +-
.../app/Magento/Checkout/Test/Block/Cart.php | 2 +-
.../Checkout/Test/Block/Cart/CartEmpty.php | 2 +-
.../Checkout/Test/Block/Cart/CartItem.php | 6 +-
.../Test/Block/Cart/DiscountCodes.php | 2 +-
.../Checkout/Test/Block/Cart/Shipping.php | 3 +-
.../Checkout/Test/Block/Cart/Sidebar.php | 2 +-
.../Checkout/Test/Block/Cart/Sidebar/Item.php | 2 +-
.../Checkout/Test/Block/Cart/Totals.php | 2 +-
.../Test/Constraint/AssertCartIsEmpty.php | 6 +-
.../AddProductsToShoppingCartEntityTest.php | 8 +--
.../DeleteProductsFromShoppingCartTest.php | 8 +--
.../Test/TestCase/UpdateShoppingCartTest.php | 8 +--
.../TestStep/AddProductsToTheCartStep.php | 8 +--
.../Product/AffectedAttributeSet.php | 9 +--
.../Product/Edit/Tab/Super/Config.php | 14 +++--
.../Edit/Tab/Super/Config/Attribute.php | 23 ++++----
.../Config/Attribute/AttributeSelector.php | 2 +-
.../Super/Config/Attribute/ToggleDropdown.php | 10 ++--
.../Product/Edit/Tab/Super/Config/Matrix.php | 16 ++---
.../Adminhtml/Product/FormPageActions.php | 2 +-
.../Block/Adminhtml/Product/ProductForm.php | 8 ++-
.../Product/View/ConfigurableOptions.php | 5 +-
...figurableAttributesAbsentOnProductPage.php | 6 +-
...leAttributesBlockIsAbsentOnProductPage.php | 6 +-
.../AssertConfigurableProductInCart.php | 6 +-
.../System/Variable/FormPageActions.php | 8 ++-
.../app/Magento/Core/Test/Block/Messages.php | 4 +-
.../Constraint/AssertCustomVariableInPage.php | 6 +-
.../Block/Account/AddressesAdditional.php | 4 +-
.../Test/Block/Account/AddressesDefault.php | 2 +-
.../Customer/Test/Block/Account/Links.php | 2 +-
.../Customer/Test/Block/Address/Edit.php | 2 +-
.../Block/Adminhtml/Edit/Tab/Addresses.php | 8 ++-
.../Test/Block/Form/ForgotPassword.php | 2 +-
.../Customer/Test/Block/Form/Login.php | 2 +-
.../Customer/Test/Block/Form/Register.php | 2 +-
.../Test/Page/Address/DefaultAddress.php | 2 +-
.../Page/CustomerAccountForgotPassword.php | 2 +-
.../Test/Page/CustomerAddressEdit.php | 2 +-
.../Catalog/Product/Edit/Tab/Downloadable.php | 17 +++---
.../Product/Edit/Tab/Downloadable/Links.php | 16 ++---
.../Product/Edit/Tab/Downloadable/Samples.php | 16 ++---
.../Test/Block/Catalog/Product/View.php | 2 +-
.../Test/Block/Catalog/Product/View/Links.php | 4 +-
.../Block/Catalog/Product/View/Samples.php | 2 +-
.../Block/Customer/Products/ListProducts.php | 2 +-
.../AssertDownloadableLinksData.php | 6 +-
.../AssertDownloadableSamplesData.php | 6 +-
.../Block/Adminhtml/Order/Create/Form.php | 6 +-
.../Block/Adminhtml/Order/Create/Items.php | 2 +-
.../Order/Create/Items/ItemProduct.php | 3 +-
.../Test/Block/Adminhtml/Order/View/Items.php | 2 +-
.../Order/View/Items/ItemProduct.php | 3 +-
.../GiftMessage/Test/Block/Message/Inline.php | 2 +-
.../Test/Block/Message/Order/Items/View.php | 2 +-
.../Types/Edit/GoogleShoppingForm.php | 10 ++--
.../Product/Grouped/AssociatedProducts.php | 13 ++--
.../ListAssociatedProducts.php | 3 +-
.../AssociatedProducts/Search/Grid.php | 1 -
.../Catalog/Product/View/Type/Grouped.php | 2 +-
.../Test/Block/Checkout/Cart/CartItem.php | 1 -
...bstractAssertPriceOnGroupedProductPage.php | 6 +-
...AssertGroupedPriceOnGroupedProductPage.php | 6 +-
.../AssertGroupedProductsDefaultQty.php | 6 +-
...AssertSpecialPriceOnGroupedProductPage.php | 6 +-
.../AssertTierPriceOnGroupedProductPage.php | 6 +-
.../Adminhtml/Integration/IntegrationGrid.php | 2 +-
.../IntegrationGrid/DeleteDialog.php | 2 +-
.../Test/Block/Adminhtml/Template/Grid.php | 2 +-
.../Test/Block/Adminhtml/Template/Preview.php | 4 +-
.../Constraint/AssertNewsletterPreview.php | 6 +-
.../Block/Adminhtml/Customer/AccountsGrid.php | 2 +-
.../Block/Adminhtml/Customer/Totals/Grid.php | 6 +-
.../Adminhtml/Refresh/Statistics/Grid.php | 2 +-
.../Block/Adminhtml/Review/Customer/Grid.php | 2 +-
.../Block/Adminhtml/Review/Products/Grid.php | 2 +-
.../Review/Products/Viewed/ProductGrid.php | 2 +-
.../Sales/Orders/Viewed/FilterGrid.php | 2 +-
.../Block/Adminhtml/Shopcart/Product/Grid.php | 2 +-
.../AbandonedCartsReportEntityTest.php | 14 ++---
.../CustomerReviewReportEntityTest.php | 6 +-
.../TestCase/ProductsInCartReportEntity.php | 6 +-
.../ViewedProductsReportEntityTest.php | 8 +--
.../Block/Adminhtml/Edit/RatingElement.php | 10 ++--
.../Test/Block/Adminhtml/ReviewForm.php | 3 +-
.../app/Magento/Review/Test/Block/Form.php | 14 ++---
.../Test/Block/Product/View/Summary.php | 4 +-
.../AssertProductRatingInProductPage.php | 6 +-
.../AssertProductRatingNotInProductPage.php | 6 +-
.../AssertProductReviewNotOnProductPage.php | 6 +-
.../AssertProductReviewOnProductPage.php | 6 +-
.../CreateProductReviewFrontendEntityTest.php | 6 +-
...anageProductReviewFromCustomerPageTest.php | 8 +--
.../Block/Adminhtml/Order/AbstractForm.php | 1 -
.../Block/Adminhtml/Order/AbstractItems.php | 2 +-
.../Test/Block/Adminhtml/Order/Actions.php | 4 +-
.../Test/Block/Adminhtml/Order/Create.php | 2 +-
.../Order/Create/Billing/Address.php | 1 -
.../Order/Create/CustomerActivities.php | 2 +-
.../Create/CustomerActivities/Sidebar.php | 2 +-
.../Sidebar/RecentlyViewedProducts.php | 5 +-
.../Block/Adminhtml/Order/Create/Items.php | 4 +-
.../Order/Create/Items/ItemProduct.php | 2 +-
.../Order/Create/Shipping/Address.php | 2 +-
.../Order/Create/Shipping/Method.php | 2 +-
.../Block/Adminhtml/Order/Create/Store.php | 2 +-
.../Sales/Test/Block/Adminhtml/Order/Grid.php | 2 +-
.../Test/Block/Adminhtml/Order/History.php | 2 +-
.../Adminhtml/Order/Invoice/Form/Items.php | 2 +-
.../Block/Adminhtml/Order/Invoice/Totals.php | 3 +-
.../Adminhtml/Order/Shipment/View/Items.php | 2 +-
.../Test/Block/Adminhtml/Order/Totals.php | 2 +-
.../Test/Block/Adminhtml/Order/View/Info.php | 2 +-
.../Test/Block/Adminhtml/Order/View/Items.php | 2 +-
.../Order/View/Tab/CreditMemos/Grid.php | 2 +-
.../Block/Adminhtml/Order/View/Tab/Info.php | 2 +-
.../Order/View/Tab/Invoices/Grid.php | 2 +-
.../Order/View/Tab/Shipments/Grid.php | 2 +-
.../Sales/Test/Block/Order/History.php | 6 +-
.../Magento/Sales/Test/Block/Order/Info.php | 2 +-
.../Magento/Sales/Test/Block/Order/Items.php | 2 +-
.../Magento/Sales/Test/Block/Order/View.php | 2 +-
.../Test/Block/Order/View/ActionsToolbar.php | 2 +-
.../Sales/Test/Page/SalesOrderShipmentNew.php | 2 +-
.../TestStep/PrintOrderOnFrontendStep.php | 8 +--
.../Test/Block/Adminhtml/Order/Tracking.php | 2 +-
.../Shipping/Test/Block/Order/Info.php | 2 +-
.../Shipping/Test/Block/Order/Shipment.php | 2 +-
.../Test/Block/Adminhtml/SitemapGrid.php | 2 +-
.../app/Magento/Store/Test/Block/Switcher.php | 2 +-
.../Test/Block/Adminhtml/Rule/Edit/Form.php | 25 ++++----
.../Tax/Test/Block/Adminhtml/Rule/Grid.php | 1 -
.../Test/Constraint/AssertTaxRuleApplying.php | 6 +-
.../Magento/Theme/Test/Block/Html/Footer.php | 6 +-
.../Magento/Theme/Test/Block/Html/Topmenu.php | 2 +-
.../app/Magento/Theme/Test/Block/Links.php | 7 ++-
.../Block/Adminhtml/Catalog/Category/Tree.php | 2 +-
.../Adminhtml/Catalog/Edit/UrlRewriteForm.php | 5 +-
.../Test/Block/Adminhtml/Selector.php | 2 +-
.../AssertPageByUrlRewriteIsNotFound.php | 6 +-
.../AssertUrlRewriteCategoryRedirect.php | 6 +-
.../AssertUrlRewriteCustomRedirect.php | 6 +-
.../AssertUrlRewriteCustomSearchRedirect.php | 6 +-
.../AssertUrlRewriteProductRedirect.php | 6 +-
...AssertUrlRewriteSuccessOutsideRedirect.php | 6 +-
.../Test/Block/Adminhtml/Role/Tab/Role.php | 6 +-
.../Test/Block/Adminhtml/User/Edit/Form.php | 2 +-
.../Block/Adminhtml/User/Edit/PageActions.php | 2 +-
.../Test/Block/Adminhtml/User/Tab/Role.php | 7 +--
.../Adminhtml/Customer/Edit/Tab/Wishlist.php | 2 +-
.../Customer/Edit/Tab/Wishlist/Grid.php | 12 ++--
.../Test/Block/Customer/Wishlist/Items.php | 4 +-
.../Block/Customer/Wishlist/Items/Product.php | 6 +-
.../Test/TestCase/ShareWishlistEntityTest.php | 6 +-
.../TestStep/AddProductsToWishlistStep.php | 8 +--
288 files changed, 1041 insertions(+), 1033 deletions(-)
delete mode 100644 dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/OptgroupselectElement.php
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/ConditionsElement.php (92%)
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/DatepickerElement.php (94%)
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/GlobalsearchElement.php (82%)
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/JquerytreeElement.php (95%)
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/LiselectstoreElement.php (80%)
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/MultiselectgrouplistElement.php (91%)
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/MultiselectlistElement.php (75%)
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/MultisuggestElement.php (65%)
create mode 100644 dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/SelectstoreElement.php (69%)
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/SuggestElement.php (70%)
mode change 100755 => 100644
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/Tree.php (79%)
rename dev/tests/functional/lib/Mtf/Client/{Driver/Selenium => }/Element/TreeElement.php (94%)
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index ab4bd87728a..fc1d2bfa0db 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,17 @@
{
+ "repositories": [
+ {
+ "type": "git",
+ "url": "https://github.corp.ebay.com/magento-firedrakes/mtf.git"
+ },
+ {
+ "type": "vcs",
+ "url": "https://github.com/giorgiosironi/phpunit-selenium.git"
+ }
+ ],
"require": {
- "magento/mtf": "1.0.0-rc10",
+ "magento/mtf": "dev-MAGETWO-32079-2",
+ "facebook/webdriver": "dev-master",
"php": ">=5.4.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/OptgroupselectElement.php b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/OptgroupselectElement.php
deleted file mode 100644
index b2156bcf2c6..00000000000
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/OptgroupselectElement.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-
-namespace Mtf\Client\Driver\Selenium\Element;
-
-use Mtf\Client\Driver\Selenium\Element;
-
-/**
- * Class OptgroupselectElement
- * Typified element class for option group selectors
- */
-class OptgroupselectElement extends SelectElement
-{
- /**
- * Option group selector
- *
- * @var string
- */
- protected $optGroup = 'optgroup[option[contains(.,"%s")]]';
-
- /**
- * Get the value of form element
- *
- * @return string
- */
- public function getValue()
- {
- $this->_eventManager->dispatchEvent(['get_value'], [(string)$this->_locator]);
- $selectedLabel = trim($this->_getWrappedElement()->selectedLabel());
- $value = trim(
- $this->_getWrappedElement()->byXPath(sprintf($this->optGroup, $selectedLabel))->attribute('label'),
- chr(0xC2) . chr(0xA0)
- );
- $value .= '/' . $selectedLabel;
- return $value;
- }
-
- /**
- * Select value in dropdown which has option groups
- *
- * @param string $value
- * @return void
- */
- public function setValue($value)
- {
- $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
- list($group, $option) = explode('/', $value);
- $optionLocator = ".//optgroup[@label='$group']/option[contains(text(), '$option')]";
- $criteria = new \PHPUnit_Extensions_Selenium2TestCase_ElementCriteria('xpath');
- $criteria->value($optionLocator);
- $this->_getWrappedElement(true)->selectOptionByCriteria($criteria);
- }
-}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
similarity index 92%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
index 358a5df3f25..17fe72704a2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
@@ -3,12 +3,10 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Driver\Selenium\Element as AbstractElement;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
use Mtf\ObjectManager;
+use Mtf\Client\Locator;
/**
* Class ConditionsElement
@@ -36,7 +34,7 @@ use Mtf\ObjectManager;
*
* @SuppressWarnings(PHPMD.TooManyFields)
*/
-class ConditionsElement extends AbstractElement
+class ConditionsElement extends SimpleElement
{
/**
* Main condition
@@ -186,10 +184,10 @@ class ConditionsElement extends AbstractElement
* Add condition combination
*
* @param string $condition
- * @param Element $context
- * @return Element
+ * @param SimpleElement $context
+ * @return SimpleElement
*/
- protected function addConditionsCombination($condition, Element $context)
+ protected function addConditionsCombination($condition, SimpleElement $context)
{
$condition = $this->parseCondition($condition);
$newCondition = $context->find($this->newCondition, Locator::SELECTOR_XPATH);
@@ -209,10 +207,10 @@ class ConditionsElement extends AbstractElement
* Add conditions
*
* @param array $conditions
- * @param Element $context
+ * @param SimpleElement $context
* @return void
*/
- protected function addMultipleCondition(array $conditions, Element $context)
+ protected function addMultipleCondition(array $conditions, SimpleElement $context)
{
foreach ($conditions as $key => $condition) {
$elementContext = is_numeric($key) ? $context : $this->addConditionsCombination($key, $context);
@@ -228,10 +226,10 @@ class ConditionsElement extends AbstractElement
* Add single Condition
*
* @param string $condition
- * @param Element $context
+ * @param SimpleElement $context
* @return void
*/
- protected function addSingleCondition($condition, Element $context)
+ protected function addSingleCondition($condition, SimpleElement $context)
{
$condition = $this->parseCondition($condition);
@@ -255,14 +253,15 @@ class ConditionsElement extends AbstractElement
* Fill single condition
*
* @param array $rules
- * @param Element $element
+ * @param SimpleElement $element
* @return void
* @throws \Exception
*/
- protected function fillCondition(array $rules, Element $element)
+ protected function fillCondition(array $rules, SimpleElement $element)
{
$this->resetKeyParam();
foreach ($rules as $rule) {
+ /** @var SimpleElement $param */
$param = $this->findNextParam($element);
$param->find('a')->click();
@@ -286,13 +285,13 @@ class ConditionsElement extends AbstractElement
return $element->isVisible() ? true : null;
}
);
- $value = $param->find('select', Locator::SELECTOR_CSS, 'select');
+ $value = $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
if ($value->isVisible()) {
$value->setValue($rule);
$this->click();
continue;
}
- $value = $param->find('input');
+ $value = $param->find('input', Locator::SELECTOR_TAG_NAME);
if ($value->isVisible()) {
$value->setValue($rule);
@@ -355,11 +354,11 @@ class ConditionsElement extends AbstractElement
/**
* Find next param of condition for fill
*
- * @param Element $context
- * @return Element
+ * @param SimpleElement $context
+ * @return SimpleElement
* @throws \Exception
*/
- protected function findNextParam(Element $context)
+ protected function findNextParam(SimpleElement $context)
{
do {
if (!isset($this->mapParams[$this->findKeyParam])) {
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/DatepickerElement.php b/dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/DatepickerElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
index 3c21916b834..1362eafe84d 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/DatepickerElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
@@ -3,15 +3,14 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* General class for datepicker elements.
*/
-class DatepickerElement extends Element
+class DatepickerElement extends SimpleElement
{
/**
* DatePicker button.
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php b/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
similarity index 82%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
index 6d59992fcdf..8cd5a1b424f 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
@@ -3,16 +3,21 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
-use Mtf\Client\Driver\Selenium\Element;
+use Mtf\Client\Locator;
+use Mtf\Client\ElementInterface;
/**
* Typified element class for global search element.
*/
-class GlobalsearchElement extends Element
+class GlobalsearchElement extends SimpleElement
{
+ /**
+ * "Backspace" key code.
+ */
+ const BACKSPACE = "\xEE\x80\x83";
+
/**
* Search icon selector.
*
@@ -48,11 +53,6 @@ class GlobalsearchElement extends Element
*/
protected $resultItem = 'li';
- /**
- * "Backspace" key code.
- */
- const BACKSPACE = "\xEE\x80\x83";
-
/**
* Set value.
*
@@ -61,7 +61,7 @@ class GlobalsearchElement extends Element
*/
public function setValue($value)
{
- $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+ $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
$this->waitInitElement();
@@ -70,7 +70,7 @@ class GlobalsearchElement extends Element
}
$this->selectWindow();
$this->clear();
- $this->find($this->searchInput)->_getWrappedElement()->value($value);
+ $this->find($this->searchInput)->setValue($value);
$this->selectWindow();
$this->waitResult();
@@ -85,7 +85,7 @@ class GlobalsearchElement extends Element
{
$element = $this->find($this->searchInput);
while ('' != $element->getValue()) {
- $element->keys([self::BACKSPACE]);
+ $element->setValue([self::BACKSPACE]);
}
}
@@ -96,8 +96,7 @@ class GlobalsearchElement extends Element
*/
protected function selectWindow()
{
- $windowHandles = $this->_driver->windowHandles();
- $this->_driver->window(end($windowHandles));
+ $this->driver->closeWindow();
}
/**
@@ -108,10 +107,10 @@ class GlobalsearchElement extends Element
*/
protected function waitInitElement()
{
- $browser = clone $this;
$selector = $this->initializedSuggest;
- $browser->waitUntil(
+ $browser = $this->driver;
+ $this->driver->waitUntil(
function () use ($browser, $selector) {
return $browser->find($selector, Locator::SELECTOR_XPATH)->isVisible() ? true : null;
}
@@ -125,10 +124,10 @@ class GlobalsearchElement extends Element
*/
public function waitResult()
{
- $browser = clone $this;
$selector = $this->searchResult;
+ $browser = $this->driver;
- $browser->waitUntil(
+ $this->driver->waitUntil(
function () use ($browser, $selector) {
if ($browser->find($selector)->isVisible()) {
return true;
@@ -173,12 +172,12 @@ class GlobalsearchElement extends Element
*/
protected function getSearchResults()
{
- /** @var Element $searchResult */
+ /** @var ElementInterface $searchResult */
$searchResult = $this->find($this->searchResult);
- $resultItems = $searchResult->find($this->resultItem)->getElements();
+ $resultItems = $searchResult->getElements($this->resultItem);
$resultArray = [];
- /** @var Element $resultItem */
+ /** @var SimpleElement $resultItem */
foreach ($resultItems as $resultItem) {
$resultItemLink = $resultItem->find('a');
$resultText = $resultItemLink->isVisible()
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/JquerytreeElement.php b/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/JquerytreeElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
index 280ef001138..f661b723fa0 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/JquerytreeElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
@@ -3,15 +3,11 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
-
-use Mtf\Client\Element;
+namespace Mtf\Client\Element;
/**
* Class JquerytreeElement
* Typified element class for JqueryTree elements
- *
- * @package Mtf\Client\Element
*/
class JquerytreeElement extends Tree
{
@@ -63,11 +59,11 @@ class JquerytreeElement extends Tree
/**
* Recursive walks tree
*
- * @param Element $node
+ * @param SimpleElement $node
* @param string $parentCssClass
* @return array
*/
- protected function _getNodeContent($node, $parentCssClass)
+ protected function _getNodeContent(SimpleElement $node, $parentCssClass)
{
$counter = 1;
$nextNodeSelector = $parentCssClass . " > " . $this->nodeSelector . ":nth-of-type($counter)";
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/LiselectstoreElement.php b/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
similarity index 80%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/LiselectstoreElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
index cd7350b5228..7183fb6d0c8 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/LiselectstoreElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
@@ -3,16 +3,15 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class LiselectstoreElement
* Typified element class for lists selectors
*/
-class LiselectstoreElement extends Element
+class LiselectstoreElement extends SimpleElement
{
/**
* Template for each element of option
@@ -64,8 +63,8 @@ class LiselectstoreElement extends Element
*/
public function setValue($value)
{
- $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
- $this->_context->find($this->toggleSelector)->click();
+ $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+ $this->driver->find($this->toggleSelector)->click();
$value = explode('/', $value);
$optionSelector = [];
@@ -74,7 +73,7 @@ class LiselectstoreElement extends Element
}
$optionSelector = './/' . implode($this->optionMaskFollowing, $optionSelector) . '/a';
- $option = $this->_context->find($optionSelector, Locator::SELECTOR_XPATH);
+ $option = $this->driver->find($optionSelector, Locator::SELECTOR_XPATH);
if (!$option->isVisible()) {
throw new \Exception('[' . implode('/', $value) . '] option is not visible in store switcher.');
}
@@ -88,13 +87,11 @@ class LiselectstoreElement extends Element
*/
protected function getLiElements()
{
- $this->_context->find($this->toggleSelector)->click();
- $criteria = new \PHPUnit_Extensions_Selenium2TestCase_ElementCriteria('css selector');
- $criteria->value('li');
- $elements = $this->_getWrappedElement()->elements($criteria);
+ $this->driver->find($this->toggleSelector)->click();
+ $elements = $this->driver->getElements('li', Locator::SELECTOR_TAG_NAME);
$dropdownData = [];
foreach ($elements as $element) {
- $class = $element->attribute('class');
+ $class = $element->getAttribute('class');
$dropdownData[] = [
'element' => $element,
'storeView' => $this->isSubstring($class, "store-switcher-store-view"),
@@ -120,7 +117,7 @@ class LiselectstoreElement extends Element
if ($dropdownElement['storeView']) {
$data[] = $this->findNearestElement('website', $key, $dropdownData) . "/"
. $this->findNearestElement('store', $key, $dropdownData) . "/"
- . $dropdownElement['element']->text();
+ . $dropdownElement['element']->getText();
}
}
return $data;
@@ -150,7 +147,7 @@ class LiselectstoreElement extends Element
{
$elementText = false;
while ($elementText == false) {
- $elementText = $elements[$key][$criteria] == true ? $elements[$key]['element']->text() : false;
+ $elementText = $elements[$key][$criteria] == true ? $elements[$key]['element']->getText() : false;
$key--;
}
return $elementText;
@@ -164,18 +161,20 @@ class LiselectstoreElement extends Element
*/
public function getValue()
{
- $this->_eventManager->dispatchEvent(['get_value'], [(string)$this->_locator]);
+ $this->eventManager->dispatchEvent(['get_value'], [$this->getAbsoluteSelector()]);
$elements = $this->getLiElements();
foreach ($elements as $key => $element) {
if ($element['current'] == true) {
if ($element['default_config'] == true) {
- return $element['element']->text();
+ return $element['element']->getText();
}
$path = $this->findNearestElement('website', $key, $elements) . "/"
. $this->findNearestElement('store', $key, $elements) . "/"
- . $element['element']->text();
+ . $element['element']->getText();
return $path;
}
}
+
+ return '';
}
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
similarity index 91%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
index ca2e200beec..760323525a4 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectgrouplistElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
@@ -3,10 +3,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class MultiselectgrouplistElement
@@ -104,7 +103,7 @@ class MultiselectgrouplistElement extends MultiselectElement
*/
public function setValue($values)
{
- $this->clearSelectedOptions();
+ $this->deselectAll();
$values = is_array($values) ? $values : [$values];
foreach ($values as $value) {
$this->selectOption($value);
@@ -151,16 +150,17 @@ class MultiselectgrouplistElement extends MultiselectElement
* Get optgroup
*
* @param string $value
- * @param Element $context
- * @return Element
+ * @param SimpleElement $context
+ * @return SimpleElement
* @throws \Exception
*/
- protected function getOptgroup($value, Element $context)
+ protected function getOptgroup($value, SimpleElement $context)
{
$optgroup = $context->find(sprintf($this->optgroupByLabel, $value), Locator::SELECTOR_XPATH);
if (!$optgroup->isVisible()) {
throw new \Exception("Can't find group \"{$value}\".");
}
+
return $optgroup;
}
@@ -168,11 +168,11 @@ class MultiselectgrouplistElement extends MultiselectElement
* Get child optgroup
*
* @param string $value
- * @param Element $context
- * @return Element
+ * @param SimpleElement $context
+ * @return SimpleElement
* @throws \Exception
*/
- protected function getChildOptgroup($value, Element $context)
+ protected function getChildOptgroup($value, SimpleElement $context)
{
$childOptgroup = null;
$count = 1;
@@ -209,7 +209,7 @@ class MultiselectgrouplistElement extends MultiselectElement
foreach ($this->getSelectedOptions() as $option) {
$value = [];
- /** @var Element $option */
+ /** @var SimpleElement $option */
$optionText = $option->getText();
$optionValue = trim($optionText, $this->trim);
$value[] = $optionValue;
@@ -219,8 +219,8 @@ class MultiselectgrouplistElement extends MultiselectElement
}
$pathOptgroup = sprintf($this->parentOptgroup, $this->indent . $optionValue);
- $optgroup = $this->_getWrappedElement()->byXPath($pathOptgroup);
- $optgroupText = $optgroup->attribute('label');
+ $optgroup = $this->find($pathOptgroup, Locator::SELECTOR_XPATH);
+ $optgroupText = $optgroup->getAttribute('label');
$optgroupValue = trim($optgroupText, $this->trim);
$amountIndent = strlen($optgroupText) - strlen($optgroupValue);
$amountIndent = $amountIndent ? ($amountIndent / strlen($this->indent)) : 0;
@@ -234,8 +234,8 @@ class MultiselectgrouplistElement extends MultiselectElement
$indent = $amountIndent ? str_repeat($this->indent, $amountIndent) : '';
$pathOptgroup .= sprintf($this->precedingOptgroup, $amountIndent * self::INDENT_LENGTH, $indent);
while (0 <= $amountIndent && $this->find($pathOptgroup, Locator::SELECTOR_XPATH)->isVisible()) {
- $optgroup = $this->_getWrappedElement()->byXPath($pathOptgroup);
- $optgroupText = $optgroup->attribute('label');
+ $optgroup = $this->find($pathOptgroup, Locator::SELECTOR_XPATH);
+ $optgroupText = $optgroup->getAttribute('label');
$optgroupValue = trim($optgroupText, $this->trim);
$value[] = $optgroupValue;
@@ -253,7 +253,7 @@ class MultiselectgrouplistElement extends MultiselectElement
/**
* Get options
*
- * @return array
+ * @return SimpleElement[]
*/
protected function getOptions()
{
@@ -287,6 +287,7 @@ class MultiselectgrouplistElement extends MultiselectElement
++$countOptgroup;
$optgroup = $this->find(sprintf($this->optgroupByNumber, $countOptgroup), Locator::SELECTOR_XPATH);
}
+
return $options;
}
@@ -299,11 +300,11 @@ class MultiselectgrouplistElement extends MultiselectElement
{
$options = [];
foreach ($this->getOptions() as $option) {
- /** Element $option */
if ($option->isSelected()) {
$options[] = $option;
}
}
+
return $options;
}
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectlistElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
similarity index 75%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectlistElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
index 522f80bc568..1cabb6a0b44 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultiselectlistElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
@@ -3,10 +3,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Typified element class for Multiple Select List elements
@@ -27,21 +26,6 @@ class MultiselectlistElement extends MultiselectElement
*/
protected $optionCheckedElement = './/*[contains(@class, "mselect-checked")]/following-sibling::span';
- /**
- * Return Wrapped Element.
- * If element was not created before:
- * 1. Context is defined. If context was not passed to constructor - test case (all page) is taken as context
- * 2. Attempt to get selenium element is performed in loop
- * that is terminated if element is found or after timeout set in configuration
- *
- * @param bool $waitForElementPresent
- * @return \PHPUnit_Extensions_Selenium2TestCase_Element|\PHPUnit_Extensions_Selenium2TestCase_Element_Select
- */
- protected function _getWrappedElement($waitForElementPresent = true)
- {
- return Element::_getWrappedElement($waitForElementPresent);
- }
-
/**
* Select options by values in multiple select list
*
@@ -54,7 +38,7 @@ class MultiselectlistElement extends MultiselectElement
$values = is_array($values) ? $values : [$values];
foreach ($options as $option) {
- /** @var Element $option */
+ /** @var SimpleElement $option */
$optionText = $option->getText();
$isChecked = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH)->isVisible();
$inArray = in_array($optionText, $values);
@@ -75,7 +59,7 @@ class MultiselectlistElement extends MultiselectElement
$options = $this->getOptions();
foreach ($options as $option) {
- /** @var Element $option */
+ /** @var SimpleElement $option */
$checkedOption = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH);
if ($checkedOption->isVisible()) {
$checkedOptions[] = $checkedOption->getText();
@@ -116,7 +100,7 @@ class MultiselectlistElement extends MultiselectElement
$options = $this->getOptions();
foreach ($options as $option) {
- /** @var Element $option */
+ /** @var SimpleElement $option */
$optionsValue[] = $option->getText();
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
similarity index 65%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
index 3457b67854d..2a9d2a5e8d1 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
@@ -3,10 +3,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Typified element class for multi suggest element.
@@ -14,74 +13,73 @@ use Mtf\Client\Element\Locator;
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
*/
public function setValue($values)
{
- $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+ $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
$this->clear();
foreach ((array)$values as $value) {
if (!$this->isChoice($value)) {
- $this->selectWindow();
parent::setValue($value);
}
}
}
/**
- * Get value.
+ * Get value
*
* @return array
*/
public function getValue()
{
- $this->_eventManager->dispatchEvent(['get_value'], [(string) $this->_locator]);
+ $this->eventManager->dispatchEvent(['get_value'], [(string) $this->getAbsoluteSelector()]);
$listChoice = $this->find($this->listChoice, Locator::SELECTOR_XPATH);
- $choices = $listChoice->find($this->choiceValue, Locator::SELECTOR_XPATH)->getElements();
+ $choices = $listChoice->getElements($this->choiceValue, Locator::SELECTOR_XPATH);
$values = [];
foreach ($choices as $choice) {
- /** @var Element $choice */
+ /** @var SimpleElement $choice */
$values[] = $choice->getText();
}
return $values;
}
/**
- * Check exist selected item.
+ * Check exist selected item
*
* @param string $value
* @return bool
@@ -92,7 +90,7 @@ class MultisuggestElement extends SuggestElement
}
/**
- * Clear element.
+ * Clear element
*
* @return void
*/
@@ -104,15 +102,4 @@ class MultisuggestElement extends SuggestElement
$choiceClose = $this->find($this->choiceClose);
}
}
-
- /**
- * Select to last window.
- *
- * @return void
- */
- protected function selectWindow()
- {
- $windowHandles = $this->_driver->windowHandles();
- $this->_driver->window(end($windowHandles));
- }
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php b/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
new file mode 100644
index 00000000000..fc0353553fd
--- /dev/null
+++ b/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Mtf\Client\Element;
+
+use Mtf\Client\Locator;
+
+/**
+ * Class OptgroupselectElement
+ * Typified element class for option group selectors
+ */
+class OptgroupselectElement extends SelectElement
+{
+ /**
+ * Option group selector
+ *
+ * @var string
+ */
+ protected $optGroup = 'optgroup[option[contains(.,"%s")]]';
+
+ /**
+ * Get the value of form element
+ *
+ * @return string
+ */
+ public function getValue()
+ {
+ $this->eventManager->dispatchEvent(['get_value'], [(string)$this->getAbsoluteSelector()]);
+ $selectedLabel = trim(parent::getValue());
+ $element = $this->find(sprintf($this->optGroup, $selectedLabel), Locator::SELECTOR_XPATH);
+ $value = trim($element->getAttribute('label'), chr(0xC2) . chr(0xA0));
+ $value .= '/' . $selectedLabel;
+ return $value;
+ }
+
+ /**
+ * Select value in dropdown which has option groups
+ *
+ * @param string $value
+ * @return void
+ */
+ public function setValue($value)
+ {
+ $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+ list($group, $option) = explode('/', $value);
+ parent::setOptionGroupValue($group, $option);
+ }
+}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SelectstoreElement.php b/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
similarity index 69%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SelectstoreElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
index 39a748fca2e..88a62e0f116 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SelectstoreElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
@@ -3,10 +3,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class SelectstoreElement
@@ -35,14 +34,11 @@ class SelectstoreElement extends SelectElement
*/
public function getValue()
{
- $selectedLabel = trim($this->_getWrappedElement()->selectedLabel());
- $value = trim(
- $this->_getWrappedElement()->byXPath(sprintf($this->website, $selectedLabel))->attribute('label')
- );
- $value .= '/' . trim(
- $this->_getWrappedElement()->byXPath(sprintf($this->storeGroup, $selectedLabel))->attribute('label'),
- chr(0xC2) . chr(0xA0)
- );
+ $selectedLabel = trim(parent::getValue());
+ $element = $this->find(sprintf($this->website, $selectedLabel), Locator::SELECTOR_XPATH);
+ $value = trim($element->getAttribute('label'));
+ $element = $this->find(sprintf($this->storeGroup, $selectedLabel), Locator::SELECTOR_XPATH);
+ $value .= '/' . trim($element->getAttribute('label'), chr(0xC2) . chr(0xA0));
$value .= '/' . $selectedLabel;
return $value;
}
@@ -61,7 +57,7 @@ class SelectstoreElement extends SelectElement
. $group[0] . '")]/following-sibling::optgroup[contains(@label,"'
. $group[1] . '")]/option[contains(text(), "'
. $group[2] . '")]';
- $option = $this->_context->find($optionLocator, Locator::SELECTOR_XPATH);
+ $option = $this->find($optionLocator, Locator::SELECTOR_XPATH);
if (!$option->isVisible()) {
throw new \Exception('[' . implode('/', $value) . '] option is not visible in store switcher.');
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
old mode 100755
new mode 100644
similarity index 70%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
index 225f4634db5..494a7724f2b
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
@@ -3,22 +3,16 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class SuggestElement
* General class for suggest elements.
*/
-class SuggestElement extends Element
+class SuggestElement extends SimpleElement
{
- /**
- * "Backspace" key code.
- */
- const BACKSPACE = "\xEE\x80\x83";
-
/**
* Selector suggest input
*
@@ -48,27 +42,13 @@ class SuggestElement extends Element
*/
public function setValue($value)
{
- $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+ $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
- $this->clear();
- $this->find($this->suggest)->_getWrappedElement()->value($value);
+ $this->find($this->suggest)->setValue($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
*
@@ -92,7 +72,7 @@ class SuggestElement extends Element
*/
public function getValue()
{
- $this->_eventManager->dispatchEvent(['get_value'], [(string)$this->_locator]);
+ $this->eventManager->dispatchEvent(['get_value'], [__METHOD__, $this->getAbsoluteSelector()]);
return $this->find($this->suggest)->getValue();
}
@@ -112,6 +92,7 @@ class SuggestElement extends Element
if (!$searchResult->isVisible()) {
return false;
}
+
return $searchResult->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH)->isVisible();
}
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/Tree.php b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
similarity index 79%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/Tree.php
rename to dev/tests/functional/lib/Mtf/Client/Element/Tree.php
index 6c25277a731..fa8572641fc 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/Tree.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
@@ -3,18 +3,15 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element as ElementInterface;
+use Mtf\Client\ElementInterface;
/**
* Class Tree
* General class for tree elements. Holds general implementation of methods, which overrides in child classes.
- *
- * @package Mtf\Client\Driver\Selenium\Element
*/
-abstract class Tree extends Element
+abstract class Tree extends SimpleElement
{
/**
* Css class for finding tree nodes
@@ -43,27 +40,25 @@ abstract class Tree extends Element
abstract public function getStructure();
/**
- * Drag'n'drop method is not accessible in this class.
- * Throws exception if used.
+ * Drag and drop element to(between) another element(s)
*
* @param ElementInterface $target
- * @throws \BadMethodCallException
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @throws \Exception
*/
public function dragAndDrop(ElementInterface $target)
{
- throw new \BadMethodCallException('Not applicable for this class of elements (TreeElement)');
+ throw new \Exception('Not applicable for this class of elements (TreeElement)');
}
/**
* getValue method is not accessible in this class.
* Throws exception if used.
*
- * @throws \BadMethodCallException
+ * @throws \Exception
*/
public function getValue()
{
- throw new \BadMethodCallException('Not applicable for this class of elements (TreeElement)');
+ throw new \Exception('Not applicable for this class of elements (TreeElement)');
}
/**
@@ -71,12 +66,12 @@ abstract class Tree extends Element
* Throws exception if used.
*
* @param array $keys
- * @throws \BadMethodCallException
+ * @throws \Exception
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function keys(array $keys)
{
- throw new \BadMethodCallException('Not applicable for this class of elements (TreeElement)');
+ throw new \Exception('Not applicable for this class of elements (TreeElement)');
}
/**
@@ -98,6 +93,7 @@ abstract class Tree extends Element
++$pathChunkCounter;
}
if ($structureChunk) {
+ /** @var SimpleElement $needleElement */
$needleElement = $structureChunk->find($this->nodeName);
$needleElement->click();
} else {
@@ -111,7 +107,7 @@ abstract class Tree extends Element
*
* @param string $pathChunk
* @param array $structureChunk
- * @return array|Element||false
+ * @return array|SimpleElement|false
*/
protected function deep($pathChunk, $structureChunk)
{
@@ -123,17 +119,18 @@ abstract class Tree extends Element
}
}
}
+
return false;
}
/**
* Recursive walks tree
*
- * @param Element $node
+ * @param SimpleElement $node
* @param string $parentCssClass
* @return array
*/
- protected function _getNodeContent($node, $parentCssClass)
+ protected function _getNodeContent(SimpleElement $node, $parentCssClass)
{
$nodeArray = [];
$nodeList = [];
@@ -147,7 +144,7 @@ abstract class Tree extends Element
}
//Write to array values of current node
foreach ($nodeList as $currentNode) {
- /** @var Element $currentNode */
+ /** @var SimpleElement $currentNode */
$nodesNames = $currentNode->find($this->nodeName);
$nodesContents = $currentNode->find($this->nodeCssClass);
$text = ltrim($nodesNames->getText());
@@ -155,9 +152,10 @@ abstract class Tree extends Element
'name' => $text,
'element' => $currentNode,
'subnodes' => $nodesContents->isVisible() ?
- $this->_getNodeContent($nodesContents, $this->nodeCssClass) : null,
+ $this->_getNodeContent($nodesContents, $this->nodeCssClass) : null,
];
}
+
return $nodeArray;
}
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/TreeElement.php b/dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/TreeElement.php
rename to dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
index 112b9723724..93ddb87e132 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/TreeElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
@@ -3,12 +3,11 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
-namespace Mtf\Client\Driver\Selenium\Element;
+namespace Mtf\Client\Element;
/**
* Class TreeElement
* Typified element class for Tree elements
- *
*/
class TreeElement extends Tree
{
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php b/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
index 9ff3fa47857..d6fac2d2a78 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
+++ b/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
@@ -190,7 +190,8 @@ abstract class AbstractFactory
{
$filename = str_replace('\\', '/', $filename);
- $classPath = str_replace(MTF_BP . '/' . $path . '/', '', $filename);
+ $classPath = substr($filename, strpos($filename, $path . '/') + strlen($path . '/'));
+
$classPath = str_replace('.php', '', $classPath);
$className = str_replace('/', '\\', $classPath);
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index 3cfdfc5ccbd..aa829591746 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -28,8 +28,8 @@
</listeners>
<php>
- <env name="app_frontend_url" value="http://localhost/index.php/" />
- <env name="app_backend_url" value="http://localhost/index.php/backend/" />
+ <env name="app_frontend_url" value="http://magento.loc/" />
+ <env name="app_backend_url" value="http://magento.loc/admin/" />
<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" />
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
index 7de696f367f..c364cad0897 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block\Admin;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Login
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
index a4992d093e1..53f53612dea 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
/**
@@ -61,7 +61,7 @@ class Cache extends Block
public function flushCacheStorage()
{
$this->_rootElement->find($this->flushCacheStorageButton)->click();
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
index 810a13753fc..b11b8cbb557 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Denied
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
index 564bc2518ea..1f673f7ffb1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
@@ -5,7 +5,7 @@
namespace Magento\Backend\Test\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class FormPageActions
@@ -109,7 +109,7 @@ class FormPageActions extends PageActions
public function delete()
{
$this->_rootElement->find($this->deleteButton)->click();
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
}
/**
@@ -130,6 +130,7 @@ class FormPageActions extends PageActions
*/
protected function waitBeforeClick()
{
+ time_nanosleep(0, 600000000);
usleep(500000);
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
index 3bc5d6748dd..7a93a7be9e1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
@@ -6,8 +6,8 @@
namespace Magento\Backend\Test\Block\Page;
use Mtf\Block\Block;
-use Mtf\Client\Driver\Selenium\Element\GlobalsearchElement;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\GlobalsearchElement;
/**
* Header block.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
index e03580e5353..d42d2524b85 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
@@ -8,7 +8,7 @@ namespace Magento\Backend\Test\Block\System\Config;
use Mtf\Block\Block;
use Mtf\Factory\Factory;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
class Form extends Block
{
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
index 92fdbecd850..952d810096d 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
@@ -7,9 +7,12 @@
namespace Magento\Backend\Test\Block\System\Config\Form;
+use Mtf\Client\Locator;
use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element;
+/**
+ * Class Group
+ */
class Group extends Form
{
/**
@@ -66,14 +69,14 @@ class Group extends Form
$element = $this->_rootElement->find(
sprintf($this->element, $field),
- Element\Locator::SELECTOR_XPATH,
+ Locator::SELECTOR_XPATH,
$input
);
if ($element->isDisabled()) {
$checkbox = $this->_rootElement->find(
sprintf($this->defaultCheckbox, $field),
- Element\Locator::SELECTOR_XPATH,
+ Locator::SELECTOR_XPATH,
'checkbox'
);
$checkbox->setValue('No');
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
index fbb974862c0..01ea8eea628 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
@@ -9,7 +9,7 @@ namespace Magento\Backend\Test\Block\System\Config;
use Magento\Backend\Test\Block\FormPageActions as AbstractPageActions;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class PageActions
@@ -34,7 +34,7 @@ class PageActions extends AbstractPageActions
{
$this->_rootElement->find($this->scopeSelector, Locator::SELECTOR_CSS, 'liselectstore')
->setValue($websiteScope);
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
return $this;
}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
index 01f38159d9a..d5f0b51a1a8 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
@@ -5,8 +5,8 @@
namespace Magento\Backend\Test\Block\System\Store\Delete;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Block\Form as AbstractForm;
-use Mtf\Client\Element;
/**
* Class Form
@@ -18,10 +18,10 @@ class Form extends AbstractForm
* Fill Backup Option in delete
*
* @param array $data
- * @param Element $element
+ * @param SimpleElement $element
* @return void
*/
- public function fillForm(array $data, Element $element = null)
+ public function fillForm(array $data, SimpleElement $element = null)
{
$mapping = $this->dataMapping($data);
$this->_fill($mapping, $element);
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
index 3317dc25a0e..bc63ca15a8c 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class GroupForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
index 27d565173b7..3251560d101 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class StoreForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
index 99eacd6fcae..d77f3b72da9 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
@@ -9,7 +9,7 @@ use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
use Magento\Store\Test\Fixture\Store;
use Magento\Store\Test\Fixture\StoreGroup;
use Magento\Store\Test\Fixture\Website;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class StoreGrid
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
index 9aa09d9ca83..c3e5cab6c22 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
@@ -7,7 +7,7 @@
namespace Magento\Backend\Test\Block\Widget;
use Mtf\Block\Form as FormInstance;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Fixture\FixtureInterface;
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
index e2752e545a0..cad401bf830 100755
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
@@ -7,11 +7,11 @@ namespace Magento\Backend\Test\Block\Widget;
use Mtf\Block\BlockFactory;
use Mtf\Block\Mapper;
-use Mtf\Client\Driver\Selenium\Browser;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
+use Mtf\Client\BrowserInterface;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Util\Iterator\File;
use Mtf\Util\XmlConverter;
@@ -43,18 +43,18 @@ class FormTabs extends Form
/**
* @constructor
- * @param Element $element
+ * @param SimpleElement $element
* @param Mapper $mapper
* @param BlockFactory $blockFactory
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param XmlConverter $xmlConverter
* @param array $config
*/
public function __construct(
- Element $element,
+ SimpleElement $element,
Mapper $mapper,
BlockFactory $blockFactory,
- Browser $browser,
+ BrowserInterface $browser,
XmlConverter $xmlConverter,
array $config = []
) {
@@ -101,10 +101,10 @@ class FormTabs extends Form
* Fill form with tabs
*
* @param FixtureInterface $fixture
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return FormTabs
*/
- public function fill(FixtureInterface $fixture, Element $element = null)
+ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
{
$tabs = $this->getFieldsByTabs($fixture);
return $this->fillTabs($tabs, $element);
@@ -114,10 +114,10 @@ class FormTabs extends Form
* Fill specified form with tabs
*
* @param array $tabs
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return FormTabs
*/
- protected function fillTabs(array $tabs, Element $element = null)
+ protected function fillTabs(array $tabs, SimpleElement $element = null)
{
$context = ($element === null) ? $this->_rootElement : $element;
foreach ($tabs as $tabName => $tabFields) {
@@ -178,13 +178,13 @@ class FormTabs extends Form
* Get data of the tabs
*
* @param FixtureInterface|null $fixture
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function getData(FixtureInterface $fixture = null, Element $element = null)
+ public function getData(FixtureInterface $fixture = null, SimpleElement $element = null)
{
$data = [];
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
index 39ce3491954..cbdefe2bd9a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
@@ -6,8 +6,8 @@
namespace Magento\Backend\Test\Block\Widget;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Factory\Factory;
/**
@@ -242,7 +242,6 @@ abstract class Grid extends Block
$this->prepareForSearch($filter);
$this->_rootElement->find($this->searchButton, Locator::SELECTOR_CSS)->click();
$this->waitLoader();
- $this->reinitRootElement();
}
/**
@@ -322,7 +321,6 @@ abstract class Grid extends Block
$this->openFilterBlock();
$this->_rootElement->find($this->resetButton, Locator::SELECTOR_CSS)->click();
$this->waitLoader();
- $this->reinitRootElement();
}
/**
@@ -364,7 +362,7 @@ abstract class Grid extends Block
{
$this->_rootElement->find($this->massactionSubmit, Locator::SELECTOR_CSS)->click();
if ($acceptAlert) {
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
}
}
@@ -374,7 +372,7 @@ abstract class Grid extends Block
* @param array $filter
* @param bool $isSearchable
* @param bool $isStrict
- * @return Element
+ * @return SimpleElement
*/
protected function getRow(array $filter, $isSearchable = true, $isStrict = true)
{
@@ -405,7 +403,7 @@ abstract class Grid extends Block
{
$data = [];
do {
- $rows = $this->_rootElement->find($this->rowItem)->getElements();
+ $rows = $this->_rootElement->getElements($this->rowItem);
foreach ($rows as $row) {
$rowData = [];
foreach ($columns as $columnName) {
@@ -447,7 +445,6 @@ abstract class Grid extends Block
$sortBlock->click();
$this->waitLoader();
}
- $this->reinitRootElement();
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
index e36ad901128..76ce6a0da55 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
@@ -6,8 +6,8 @@
namespace Magento\Backend\Test\Block\Widget;
use Mtf\Block\Form as AbstractForm;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Element\SimpleElement;
+use Mtf\Client\Locator;
/**
* Class Tab
@@ -42,10 +42,10 @@ class Tab extends AbstractForm
* Fill data to fields on tab
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
$data = $this->dataMapping($fields);
$this->_fill($data, $element);
@@ -57,10 +57,10 @@ class Tab extends AbstractForm
* Get data of tab
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
$data = $this->dataMapping($fields);
return $this->_getData($data, $element);
@@ -70,9 +70,9 @@ class Tab extends AbstractForm
* Update data to fields on tab
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
*/
- public function updateFormTab(array $fields, Element $element = null)
+ public function updateFormTab(array $fields, SimpleElement $element = null)
{
$this->fillFormTab($fields, $element);
}
@@ -85,7 +85,7 @@ class Tab extends AbstractForm
public function getJsErrors()
{
$data = [];
- $elements = $this->_rootElement->find($this->mageErrorField, Locator::SELECTOR_XPATH)->getElements();
+ $elements = $this->_rootElement->getElements($this->mageErrorField, Locator::SELECTOR_XPATH);
foreach ($elements as $element) {
$error = $element->find($this->mageErrorText, Locator::SELECTOR_XPATH);
if ($error->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
index 382c25e6a61..fde3f028a90 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
@@ -4,7 +4,7 @@
*/
namespace Magento\Backend\Test\Page;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Page\Page;
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 8ef08c1c0f8..8d52f7d4676 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -6,6 +6,7 @@
namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option;
use Mtf\Client\Element;
@@ -54,10 +55,10 @@ class Bundle extends Tab
* Fill bundle options
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
if (!isset($fields['bundle_selections'])) {
return $this;
@@ -79,10 +80,10 @@ class Bundle extends Tab
* Get data to fields on downloadable tab
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
$newFields = [];
if (!isset($fields['bundle_selections'])) {
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 0e7b128fdf8..45f4ffe51f3 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -8,8 +8,7 @@ namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle;
use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Search\Grid;
use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection;
use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Option
@@ -91,7 +90,7 @@ class Option extends Form
{
$mapping = $this->dataMapping($fields);
$this->_fill($mapping);
- $selections = $this->_rootElement->find($this->removeSelection)->getElements();
+ $selections = $this->_rootElement->getElements($this->removeSelection);
if (count($selections)) {
foreach ($selections as $itemSelection) {
$itemSelection->click();
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
index 806f152f189..adebff8b556 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
@@ -7,7 +7,7 @@ namespace Magento\Bundle\Test\Block\Catalog\Product;
use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Bundle;
use Magento\Bundle\Test\Fixture\BundleProduct;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
@@ -69,7 +69,6 @@ class View extends \Magento\Catalog\Test\Block\Product\View
$selector = $this->newsletterFormSelector;
$this->browser->waitUntil(
function () use ($browser, $selector) {
- $this->reinitRootElement();
$element = $browser->find($selector);
return $element->isVisible() ? true : null;
}
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
index 9b885d9ccc0..3b116840e0f 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
@@ -8,9 +8,10 @@ namespace Magento\Bundle\Test\Block\Catalog\Product\View\Type;
use Magento\Bundle\Test\Fixture\Bundle as BundleDataFixture;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
@@ -110,7 +111,7 @@ class Bundle extends Block
throw new \Exception("Can't find option: \"{$title}\"");
}
- /** @var Element $optionElement */
+ /** @var SimpleElement $optionElement */
$optionElement = $listFormOptions[$title];
$getTypeData = 'get' . $this->optionNameConvert($option['type']) . 'Data';
@@ -151,10 +152,10 @@ class Bundle extends Block
/**
* Get data of "Drop-down" option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getDropdownData(Element $option)
+ protected function getDropdownData(SimpleElement $option)
{
$select = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'select');
// Skip "Choose option ..."(option #1)
@@ -164,10 +165,10 @@ class Bundle extends Block
/**
* Get data of "Multiple select" option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getMultipleselectData(Element $option)
+ protected function getMultipleselectData(SimpleElement $option)
{
$multiselect = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'multiselect');
$data = $this->getSelectOptionsData($multiselect, 1);
@@ -183,13 +184,13 @@ class Bundle extends Block
/**
* Get data of "Radio buttons" option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getRadiobuttonsData(Element $option)
+ protected function getRadiobuttonsData(SimpleElement $option)
{
$listOptions = [];
- $optionLabels = $option->find($this->optionLabel, Locator::SELECTOR_XPATH)->getElements();
+ $optionLabels = $option->getElements($this->optionLabel, Locator::SELECTOR_XPATH);
foreach ($optionLabels as $optionLabel) {
if ($optionLabel->isVisible()) {
@@ -203,10 +204,10 @@ class Bundle extends Block
/**
* Get data of "Checkbox" option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getCheckboxData(Element $option)
+ protected function getCheckboxData(SimpleElement $option)
{
$data = $this->getRadiobuttonsData($option);
@@ -221,11 +222,11 @@ class Bundle extends Block
/**
* Get data from option of select and multiselect
*
- * @param Element $element
+ * @param SimpleElement $element
* @param int $firstOption
* @return array
*/
- protected function getSelectOptionsData(Element $element, $firstOption = 1)
+ protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1)
{
$listOptions = [];
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 2fd74a3e6e3..7a11a367432 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
@@ -7,7 +7,7 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractAssertForm;
/**
@@ -25,13 +25,13 @@ class AssertBundleItemsOnProductPage extends AbstractAssertForm
*
* @param CatalogProductView $catalogProductView
* @param BundleProduct $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
BundleProduct $product,
- Browser $browser
+ BrowserInterface $browser
) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
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 a0452c4bcf5..d4ac0599686 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
@@ -8,7 +8,7 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -36,7 +36,7 @@ class AssertBundlePriceType extends AbstractConstraint
* @param CatalogProductView $catalogProductView
* @param BundleProduct $product
* @param CheckoutCart $checkoutCartView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param BundleProduct $originalProduct [optional]
* @return void
*/
@@ -44,7 +44,7 @@ class AssertBundlePriceType extends AbstractConstraint
CatalogProductView $catalogProductView,
BundleProduct $product,
CheckoutCart $checkoutCartView,
- Browser $browser,
+ BrowserInterface $browser,
BundleProduct $originalProduct = null
) {
$checkoutCartView->open()->getCartBlock()->clearShoppingCart();
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 5dc36a9727a..079855b751b 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
@@ -7,7 +7,7 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -23,13 +23,13 @@ class AssertBundlePriceView extends AbstractConstraint
* Assert that displayed price view for bundle product on product page equals passed from fixture.
*
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param BundleProduct $product
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
- Browser $browser,
+ BrowserInterface $browser,
BundleProduct $product
) {
//Open product view page
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 459247667b2..29b978674c7 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
@@ -7,7 +7,7 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Fixture\FixtureInterface;
/**
@@ -36,13 +36,16 @@ class AssertTierPriceOnBundleProductPage extends AssertProductTierPriceOnProduct
/**
* Assertion that tier prices are displayed correctly
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductView $catalogProductView
* @param FixtureInterface $product
* @return void
*/
- public function processAssert(Browser $browser, CatalogProductView $catalogProductView, FixtureInterface $product)
- {
+ public function processAssert(
+ BrowserInterface $browser,
+ CatalogProductView $catalogProductView,
+ FixtureInterface $product
+ ) {
//Open product view page
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
$viewBlock = $catalogProductView->getBundleViewBlock();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
index 54485d3e466..fc82ba6e256 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
@@ -6,6 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
use Magento\Catalog\Test\Block\Adminhtml\Category\Tab\ProductGrid;
use Mtf\Client\Element;
@@ -33,10 +34,10 @@ class Product extends Tab
* Fill category products
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return void
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
if (!isset($fields['category_products'])) {
return;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index 6402bd1873a..f50e26b2108 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -6,11 +6,12 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Category;
-use Magento\Catalog\Test\Fixture\CatalogCategory;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
+use Mtf\Client\Element\TreeElement;
+use Magento\Catalog\Test\Fixture\CatalogCategory;
/**
* Class Tree
@@ -159,7 +160,9 @@ class Tree extends Block
public function isCategoryVisible(CatalogCategory $category)
{
$categoryPath = $this->prepareFullCategoryPath($category);
- $structure = $this->_rootElement->find($this->treeElement, Locator::SELECTOR_CSS, 'tree')->getStructure();
+ /** @var TreeElement $treeElement */
+ $treeElement = $this->_rootElement->find($this->treeElement, Locator::SELECTOR_CSS, 'tree');
+ $structure = $treeElement->getStructure();
$result = false;
$element = array_shift($categoryPath);
foreach ($structure as $item) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
index a4208e0faff..ed2a2ade91a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Category\Widget;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class CategoryChooser
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
index 333214bbc55..7e748cd66aa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
@@ -5,10 +5,11 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute;
-use Magento\Backend\Test\Block\Widget\FormTabs;
use Magento\Backend\Test\Block\Widget\Tab;
+use Magento\Backend\Test\Block\Widget\FormTabs;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
@@ -34,10 +35,10 @@ class AttributeForm extends FormTabs
* Fill the attribute form.
*
* @param FixtureInterface $fixture
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fill(FixtureInterface $fixture, Element $element = null)
+ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
{
$this->browser->switchToFrame(new Locator($this->iFrame));
$browser = $this->browser;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
index cad2b7fbdf8..3225bc8194c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
@@ -5,13 +5,13 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Catalog product custom attribute element.
*/
-class CustomAttribute extends Element
+class CustomAttribute extends SimpleElement
{
/**
* Attribute input selector;
@@ -41,7 +41,7 @@ class CustomAttribute extends Element
*/
public function setValue($data)
{
- $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+ $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
$element = $this->getElementByClass($this->getElementClass());
$value = is_array($data) ? $data['value'] : $data;
$this->find($this->inputSelector, Locator::SELECTOR_CSS, $element)->setValue($value);
@@ -54,7 +54,7 @@ class CustomAttribute extends Element
*/
public function getValue()
{
- $this->_eventManager->dispatchEvent(['get_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+ $this->eventManager->dispatchEvent(['get_value'], [__METHOD__, $this->getAbsoluteSelector()]);
$inputType = $this->getElementByClass($this->getElementClass());
return $this->find($this->inputSelector, Locator::SELECTOR_CSS, $inputType)->getValue();
}
@@ -83,9 +83,6 @@ class CustomAttribute extends Element
*/
protected function getElementClass()
{
- $criteria = new \PHPUnit_Extensions_Selenium2TestCase_ElementCriteria('css selector');
- $criteria->value($this->inputSelector);
- $input = $this->_getWrappedElement()->element($criteria);
- return $input->attribute('class');
+ return $this->find($this->inputSelector, Locator::SELECTOR_CSS)->getAttribute('class');
}
}
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 1d70bd71d2f..cf3ee2310f3 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
@@ -5,10 +5,11 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
-use Magento\Backend\Test\Block\Widget\FormTabs;
use Magento\Backend\Test\Block\Widget\Tab;
+use Magento\Backend\Test\Block\Widget\FormTabs;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
@@ -35,14 +36,14 @@ class AttributeForm extends FormTabs
* Get data of the tabs.
*
* @param FixtureInterface $fixture
- * @param Element $element
+ * @param SimpleElement $element
* @return array
* @throws \Exception
*
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function getData(FixtureInterface $fixture = null, Element $element = null)
+ public function getData(FixtureInterface $fixture = null, SimpleElement $element = null)
{
$this->waitForElementVisible($this->propertiesTab);
$data = [];
@@ -78,7 +79,7 @@ class AttributeForm extends FormTabs
*/
protected function expandAllToggles()
{
- $closedToggles = $this->_rootElement->find($this->closedToggle, Locator::SELECTOR_XPATH)->getElements();
+ $closedToggles = $this->_rootElement->getElements($this->closedToggle, Locator::SELECTOR_XPATH);
foreach ($closedToggles as $toggle) {
$toggle->click();
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
index 01ff562d6fd..4b904370103 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
@@ -5,14 +5,14 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
-use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options\Option;
-use Mtf\Client\Driver\Selenium\Element;
use Mtf\ObjectManager;
+use Mtf\Client\Element\SimpleElement;
+use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options\Option;
/**
* Options element.
*/
-class Options extends Element
+class Options extends SimpleElement
{
/**
* 'Add Option' button.
@@ -51,7 +51,7 @@ class Options extends Element
public function getValue()
{
$data = [];
- $options = $this->find($this->option)->getElements();
+ $options = $this->getElements($this->option);
foreach ($options as $option) {
$data[] = $this->getFormInstance($option)->getData();
}
@@ -61,10 +61,10 @@ class Options extends Element
/**
* Get options form.
*
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return Option
*/
- protected function getFormInstance(Element $element = null)
+ protected function getFormInstance(SimpleElement $element = null)
{
return ObjectManager::getInstance()->create(
'Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options\Option',
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index b3eb3df2f92..29140a26425 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -6,6 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
/**
@@ -32,10 +33,10 @@ class Advanced extends Tab
* Fill 'Advanced Attribute Properties' tab
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
if (!$this->_rootElement->find($this->propertiesTabActive)->isVisible()) {
$this->_rootElement->find($this->propertiesTab)->click();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
index 149908ae0f0..67265bad3e3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
@@ -6,6 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
/**
@@ -25,10 +26,10 @@ class Options extends Tab
* Fill 'Options' tab
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
foreach ($fields['options']['value'] as $field) {
$this->_rootElement->find($this->addOption)->click();
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 8d54abfe9a0..3645df6cc67 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Main
@@ -122,7 +122,7 @@ class Main extends Block
public function addAttributeSetGroup($groupName)
{
$this->_rootElement->find($this->addGroupButton)->click();
- $this->_rootElement->setAlertText($groupName);
- $this->_rootElement->acceptAlert();
+ $this->browser->setAlertText($groupName);
+ $this->browser->acceptAlert();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
index ce754a0f67e..2d038c74d59 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -6,12 +6,11 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Composite;
-use Magento\Backend\Test\Block\Template;
-use Magento\Catalog\Test\Block\AbstractConfigureBlock;
-use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+use Magento\Catalog\Test\Block\AbstractConfigureBlock;
/**
* Class Configure
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 4abeb778750..47a11a74831 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action;
use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element;
+use Mtf\Client\Locator;
/**
* Product attribute massaction edit page.
@@ -36,7 +36,7 @@ class Attribute extends Form
{
$this->_rootElement->find(
$this->priceFieldEnablerSelector,
- Element\Locator::SELECTOR_XPATH,
+ Locator::SELECTOR_XPATH,
'checkbox'
)->setValue('Yes');
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
index 7e1b73423dd..5c25fc2e526 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
@@ -5,8 +5,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit;
-use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
/**
* Class AdvancedPricingTab
@@ -28,10 +27,10 @@ class AdvancedPricingTab extends ProductTab
* Fill 'Advanced price' product form on tab
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
$context = $element ? $element : $this->_rootElement;
foreach ($fields as $fieldName => $field) {
@@ -65,10 +64,10 @@ class AdvancedPricingTab extends ProductTab
* Get data of tab
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
$formData = [];
foreach ($fields as $fieldName => $field) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
index 37b86601d6d..f9b645cceef 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\AdvancedPricingTab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
/**
* Class OptionField
@@ -25,10 +25,10 @@ class OptionGroup extends AbstractOptions
* Fill the form 'Extended price'
*
* @param array $fields
- * @param Element $element
+ * @param SimpleElement $element
* @return $this
*/
- public function fillOptions(array $fields, Element $element = null)
+ public function fillOptions(array $fields, SimpleElement $element = null)
{
$this->_rootElement->find($this->buttonFormLocator)->click();
return parent::fillOptions($fields, $element);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
index 8ee0d73f5fa..cf3c4ac2e12 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\AdvancedPricingTab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
/**
* Class OptionTier
@@ -25,10 +25,10 @@ class OptionTier extends AbstractOptions
* Fill product form 'Tier price'
*
* @param array $fields
- * @param Element $element
+ * @param SimpleElement $element
* @return $this
*/
- public function fillOptions(array $fields, Element $element = null)
+ public function fillOptions(array $fields, SimpleElement $element = null)
{
$this->_rootElement->find($this->buttonFormLocator)->click();
return parent::fillOptions($fields, $element);
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 ef5d3093b92..cbe632cd267 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
@@ -5,7 +5,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
index 7e18f842487..ccc4b80443d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
@@ -5,9 +5,9 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
-use Magento\Backend\Test\Block\Widget\Grid;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
+use Magento\Backend\Test\Block\Widget\Grid;
+use Mtf\Client\Element\SimpleElement;
/**
* Class AbstractRelated
@@ -26,10 +26,10 @@ abstract class AbstractRelated extends Tab
* Select related products
*
* @param array $data
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $data, Element $element = null)
+ public function fillFormTab(array $data, SimpleElement $element = null)
{
if (isset($data[$this->relatedType]['value'])) {
$context = $element ? $element : $this->_rootElement;
@@ -47,10 +47,10 @@ abstract class AbstractRelated extends Tab
* Get data of tab
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
$relatedBlock = $this->getRelatedGrid($element);
$columns = [
@@ -66,8 +66,8 @@ abstract class AbstractRelated extends Tab
/**
* Return related products grid
*
- * @param Element $element
+ * @param SimpleElement $element
* @return Grid
*/
- abstract protected function getRelatedGrid(Element $element = null);
+ abstract protected function getRelatedGrid(SimpleElement $element = null);
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index 6dcff1c3113..b950640df46 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -5,8 +5,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Attributes;
+use Mtf\Client\Element\SuggestElement;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Driver\Selenium\Element\SuggestElement;
/**
* Class FormAttributeSearch
@@ -71,6 +71,7 @@ class Search extends SuggestElement
if ($this->find($this->searchResult)->getText() == $productAttribute->getFrontendLabel()) {
return true;
}
+
return false;
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index fdad5f4feb5..8a31aed3faf 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Crosssell\Grid as CrosssellGrid;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Crosssell
@@ -32,10 +32,10 @@ class Crosssell extends AbstractRelated
/**
* Return cross sell products grid
*
- * @param Element|null $element [optional]
+ * @param SimpleElement|null $element [optional]
* @return CrosssellGrid
*/
- protected function getRelatedGrid(Element $element = null)
+ protected function getRelatedGrid(SimpleElement $element = null)
{
$element = $element ? $element : $this->_rootElement;
return $this->blockFactory->create(
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
index 7608ad8fe79..70df5b26c7b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
@@ -6,9 +6,10 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\Search\Grid;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\ObjectManager;
+use Mtf\Client\Locator;
/**
* Class Options
@@ -55,10 +56,10 @@ class Options extends Tab
* Fill custom options form on tab
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
$fields = reset($fields);
if (empty($fields['value']) || !is_array($fields['value'])) {
@@ -135,10 +136,10 @@ class Options extends Tab
* Get data of tab
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
$fields = reset($fields);
$formData = [];
@@ -195,6 +196,7 @@ class Options extends Tab
$importOptions = $options['import']['options'];
$options = array_merge($options, $importOptions);
unset($options['import']);
+
return $options;
}
@@ -210,6 +212,7 @@ class Options extends Tab
if ($end = strpos($str, '-')) {
$str = substr($str, 0, $end) . ucfirst(substr($str, ($end + 1)));
}
+
return $str;
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
index c96187a43aa..42e74a91ca9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
@@ -5,8 +5,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options;
+use Mtf\Client\Element\SimpleElement;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
/**
* Abstract class AbstractOptions
@@ -18,14 +18,15 @@ abstract class AbstractOptions extends Tab
* Fills in the form of an array of input data
*
* @param array $fields
- * @param Element $element
+ * @param SimpleElement $element
* @return $this
*/
- public function fillOptions(array $fields, Element $element = null)
+ public function fillOptions(array $fields, SimpleElement $element = null)
{
$element = $element === null ? $this->_rootElement : $element;
$mapping = $this->dataMapping($fields);
$this->_fill($mapping, $element);
+
return $this;
}
@@ -33,13 +34,14 @@ abstract class AbstractOptions extends Tab
* Getting options data form on the product form
*
* @param array $fields
- * @param Element $element
+ * @param SimpleElement $element
* @return $this
*/
- public function getDataOptions(array $fields = null, Element $element = null)
+ public function getDataOptions(array $fields = null, SimpleElement $element = null)
{
$element = $element === null ? $this->_rootElement : $element;
$mapping = $this->dataMapping($fields);
+
return $this->_getData($mapping, $element);
}
}
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 c7cb8cbc125..3f3281c4e1b 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\Type;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
/**
* Form "Option dropdown" on tab product "Custom options".
@@ -31,13 +31,14 @@ class DropDown extends AbstractOptions
* Fill the form.
*
* @param array $fields
- * @param Element $element
+ * @param SimpleElement $element
* @return $this
*/
- public function fillOptions(array $fields, Element $element = null)
+ public function fillOptions(array $fields, SimpleElement $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/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
index 1d8f0518248..af37196727a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
@@ -5,7 +5,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
-use Mtf\Client\Driver\Selenium\Element\SuggestElement;
+use Mtf\Client\Element\SuggestElement;
/**
* Class AttributeSet
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 50939e39db4..17aa4fbea6f 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
@@ -5,8 +5,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
-use Mtf\Client\Driver\Selenium\Element\MultisuggestElement;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\MultisuggestElement;
/**
* Typified element class for category element.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
index 92f90f9e7b1..c5ee20db389 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
@@ -5,14 +5,14 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class ProductOnlineSwitcher
* Typified element class for product status element
*/
-class ProductOnlineSwitcher extends Element
+class ProductOnlineSwitcher extends SimpleElement
{
/**
* CSS locator button status of the product
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
index a35229e7b51..e7b2f21c812 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related\Grid as RelatedGrid;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Related
@@ -32,12 +32,13 @@ class Related extends AbstractRelated
/**
* Return related products grid
*
- * @param Element|null $element [optional]
+ * @param SimpleElement|null $element [optional]
* @return RelatedGrid
*/
- protected function getRelatedGrid(Element $element = null)
+ protected function getRelatedGrid(SimpleElement $element = null)
{
$element = $element ? $element : $this->_rootElement;
+
return $this->blockFactory->create(
'\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related\Grid',
['element' => $element->find($this->relatedGrid)]
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index bb831dec3e5..d81f389fe17 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell\Grid as UpsellGrid;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Upsell
@@ -32,12 +32,13 @@ class Upsell extends AbstractRelated
/**
* Return related products grid
*
- * @param Element|null $element [optional]
+ * @param SimpleElement|null $element [optional]
* @return UpsellGrid
*/
- protected function getRelatedGrid(Element $element = null)
+ protected function getRelatedGrid(SimpleElement $element = null)
{
$element = $element ? $element : $this->_rootElement;
+
return $this->blockFactory->create(
'\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell\Grid',
['element' => $element->find($this->crossSellGrid)]
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
index 5b4d7fd23a5..c493015717c 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
@@ -5,14 +5,14 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Websites;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class StoreTree
* Typified element class for store tree element
*/
-class StoreTree extends Element
+class StoreTree extends SimpleElement
{
/**
* Selector for website checkbox
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
index af6cd68d4cb..aec8b15c2bd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product;
use Magento\Backend\Test\Block\FormPageActions as ParentFormPageActions;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
index a25ca762b75..005f1db13cd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product;
use Magento\Backend\Test\Block\GridPageActions as ParentGridPageActions;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class GridPageAction
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 40e6a4d5d17..b9aabc785d3 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
@@ -9,11 +9,12 @@ use Magento\Backend\Test\Block\Widget\FormTabs;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\AttributeForm;
use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\CustomAttribute;
-use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Mtf\Client\Element\SimpleElement;
+use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab;
use Magento\Catalog\Test\Fixture\Product;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\DataFixture;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
@@ -125,13 +126,13 @@ class ProductForm extends FormTabs
* Fill the product form.
*
* @param FixtureInterface $product
- * @param Element|null $element [optional]
+ * @param SimpleElement|null $element [optional]
* @param FixtureInterface|null $category [optional]
* @return FormTabs
*
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
- public function fill(FixtureInterface $product, Element $element = null, FixtureInterface $category = null)
+ public function fill(FixtureInterface $product, SimpleElement $element = null, FixtureInterface $category = null)
{
$dataConfig = $product->getDataConfig();
$typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null;
@@ -183,7 +184,6 @@ class ProductForm extends FormTabs
$tab = $this->openTab($tabName);
$tab->addNewAttribute($tabName);
$this->fillAttributeForm($attribute);
- $this->reinitRootElement();
}
}
@@ -191,12 +191,13 @@ class ProductForm extends FormTabs
* Get data of the tabs.
*
* @param FixtureInterface|null $fixture
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getData(FixtureInterface $fixture = null, Element $element = null)
+ public function getData(FixtureInterface $fixture = null, SimpleElement $element = null)
{
$this->showAdvancedSettings();
+
return parent::getData($fixture, $element);
}
@@ -329,6 +330,7 @@ class ProductForm extends FormTabs
$tabName = strtolower($tabName);
$selector = sprintf($this->customTab, $tabName);
$this->waitForElementVisible($selector, Locator::SELECTOR_XPATH);
+
return $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible();
}
@@ -364,6 +366,7 @@ class ProductForm extends FormTabs
$data[$tabName] = $errors;
}
}
+
return $data;
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
index dc15b7c6332..dd542c4fb37 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Block\Category;
use Magento\Widget\Test\Fixture\Widget;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class View
@@ -65,8 +65,7 @@ class View extends Block
{
$products = [];
$this->waitForElementVisible($this->recentlyViewedProducts, Locator::SELECTOR_XPATH);
- $productNames = $this->_rootElement->find($this->recentlyViewedProducts, Locator::SELECTOR_XPATH)
- ->getElements();
+ $productNames = $this->_rootElement->getElements($this->recentlyViewedProducts, Locator::SELECTOR_XPATH);
foreach ($productNames as $productName) {
$products[] = $productName->getText();
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
index b1cf8ecbd86..cfd736f143f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
@@ -5,10 +5,11 @@
namespace Magento\Catalog\Test\Block\Product;
-use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Mtf\Block\Block;
+use Mtf\Client\Locator;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
/**
* Product additional information block on the product page.
@@ -32,18 +33,19 @@ class Additional extends Block
/**
* Get product attributes.
*
- * @return Element[]
+ * @return SimpleElement[]
*/
protected function getProductAttributes()
{
$data = [];
- $elements = $this->_rootElement->find($this->attributeSelector, Locator::SELECTOR_XPATH)->getElements();
+ $elements = $this->_rootElement->getElements($this->attributeSelector, Locator::SELECTOR_XPATH);
foreach ($elements as $element) {
$data[$element->getText()] = $this->_rootElement->find(
$this->attributeSelector . $this->attributeValueSelector,
Locator::SELECTOR_XPATH
);
}
+
return $data;
}
@@ -66,11 +68,11 @@ class Additional extends Block
/**
* Find <tag1><tag2><tagN> ... </tagN></tag2></tag1> tag structure in element.
*
- * @param Element $element
+ * @param SimpleElement $element
* @param string $selector
- * @return Element
+ * @return SimpleElement
*/
- protected function checkHtmlTagStructure(Element $element, $selector)
+ protected function checkHtmlTagStructure(SimpleElement $element, $selector)
{
return $element->find($selector);
}
@@ -104,6 +106,7 @@ class Additional extends Block
for ($index = 0; $index < $middleElement; $index++) {
$selector .= $htmlData[$index]['tag'] . " ";
}
+
return trim($selector);
}
}
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 8383790a3b0..c0b09ce946b 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
@@ -6,8 +6,9 @@
namespace Magento\Catalog\Test\Block\Product\Compare;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Mtf\Client\Element\SimpleElement;
/**
* Compare list product block.
@@ -115,7 +116,7 @@ class ListCompare extends Block
* Get item compare product info.
*
* @param int $index
- * @return Element
+ * @return SimpleElement
*/
protected function getCompareProductInfo($index)
{
@@ -138,7 +139,7 @@ class ListCompare extends Block
);
$data = [];
- $attributes = $this->_rootElement->find($this->attribute)->getElements();
+ $attributes = $this->_rootElement->getElements($this->attribute);
foreach ($attributes as $attribute) {
$data[] = $attribute->getText();
}
@@ -149,7 +150,7 @@ class ListCompare extends Block
* Get item compare product attribute.
*
* @param string $key
- * @return Element
+ * @return SimpleElement
*/
public function getCompareProductAttribute($key)
{
@@ -206,7 +207,6 @@ class ListCompare extends Block
while ($this->isProductVisible()) {
$this->removeProduct();
$messageBlock->waitSuccessMessage();
- $this->reinitRootElement();
}
}
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 597ab1fa296..1e882296bf7 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
@@ -5,8 +5,6 @@
namespace Magento\Catalog\Test\Block\Product\Compare;
-use Mtf\Client\Element;
-
/**
* Compare product block on cms page.
*/
@@ -50,7 +48,7 @@ class Sidebar extends ListCompare
return $rootElement->find($selector)->isVisible() ? true : null;
}
);
- $elements = $this->_rootElement->find($this->productName)->getElements();
+ $elements = $this->_rootElement->getElements($this->productName);
foreach ($elements as $element) {
$result[] = $element->getText();
}
@@ -73,6 +71,6 @@ class Sidebar extends ListCompare
public function clickClearAll()
{
$this->_rootElement->find($this->clearAll)->click();
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
index 58627610e68..66a0c6cd76c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
@@ -6,8 +6,9 @@
namespace Magento\Catalog\Test\Block\Product\Grouped;
use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
/**
@@ -19,7 +20,7 @@ class AssociatedProducts extends Tab
/**
* 'Create New Option' button
*
- * @var Element
+ * @var SimpleElement
*/
protected $addNewOption = '#grouped-product-container>button';
@@ -52,10 +53,10 @@ class AssociatedProducts extends Tab
/**
* Get associated products list block
*
- * @param Element $context
+ * @param SimpleElement $context
* @return \Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts
*/
- protected function getListAssociatedProductsBlock(Element $context = null)
+ protected function getListAssociatedProductsBlock(SimpleElement $context = null)
{
$element = $context ?: $this->_rootElement;
@@ -68,10 +69,10 @@ class AssociatedProducts extends Tab
* Fill data to fields on tab
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
if (isset($fields['grouped_products'])) {
foreach ($fields['grouped_products']['value'] as $groupedProduct) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index 47d0630b7ab..45026dd557b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Factory\Factory;
/**
@@ -20,10 +20,10 @@ class ListAssociatedProducts extends Block
* Getting block products
*
* @param string $productId
- * @param Element $context
+ * @param SimpleElement $context
* @return ListAssociatedProducts\Product
*/
- private function getProductBlock($productId, Element $context = null)
+ private function getProductBlock($productId, SimpleElement $context = null)
{
$element = $context ?: $this->_rootElement;
return Factory::getBlockFactory()
@@ -39,9 +39,9 @@ class ListAssociatedProducts extends Block
* Filling options products
*
* @param array $data
- * @param Element $element
+ * @param SimpleElement $element
*/
- public function fillProductOptions(array $data, Element $element = null)
+ public function fillProductOptions(array $data, SimpleElement $element = null)
{
$productBlock = $this->getProductBlock($data['product_id']['value'], $element);
$productBlock->fillQty($data['selection_qty']['value']);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
index 55f1ca0604a..24410cd98cc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
@@ -7,6 +7,9 @@ namespace Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts\ListAsso
use Mtf\Block\Block;
+/**
+ * Class Product
+ */
class Product extends Block
{
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php
index 67001399d28..53c3b4a9310 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php
@@ -9,7 +9,6 @@ use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
/**
* Class Grid
- *
*/
class Grid extends GridInterface
{
@@ -36,6 +35,8 @@ class Grid extends GridInterface
/**
* Initialize block elements
+ *
+ * @return void
*/
protected function _init()
{
@@ -45,6 +46,8 @@ class Grid extends GridInterface
/**
* Press 'Add Selected Products' button
+ *
+ * @return void
*/
public function addProducts()
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
index 14205924663..3e48232ef20 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Product;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Factory\Factory;
/**
@@ -134,7 +134,7 @@ class ListProduct extends Block
* This method returns the element representing the product details for the named product.
*
* @param string $productName String containing the name of the product
- * @return Element
+ * @return SimpleElement
*/
protected function getProductDetailsElement($productName)
{
@@ -148,7 +148,7 @@ class ListProduct extends Block
* This method returns the element on the page associated with the product name.
*
* @param string $productName String containing the name of the product
- * @return Element
+ * @return SimpleElement
*/
protected function getProductNameElement($productName)
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
index 10a1c191bd1..840f7f50707 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
@@ -5,8 +5,8 @@
namespace Magento\Catalog\Test\Block\Product;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Price
@@ -266,7 +266,7 @@ class Price extends Block
* Get specify type price element
*
* @param string $type
- * @return Element
+ * @return SimpleElement
*/
protected function getTypePriceElement($type)
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
index 746d75e836d..d29a20da455 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
@@ -5,11 +5,11 @@
namespace Magento\Catalog\Test\Block\Product\ProductList;
-use Magento\Catalog\Test\Fixture\Product;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
+use Mtf\Client\Element\SimpleElement;
+use Magento\Catalog\Test\Fixture\Product;
/**
* Class Crosssell
@@ -40,7 +40,7 @@ class Crosssell extends Block
* Click on cross-sell product link
*
* @param Product $product
- * @return Element
+ * @return SimpleElement
*/
public function clickLink($product)
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
index e9b3bb40e2e..4b606cbd7bd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Product\ProductList;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Related
@@ -72,7 +72,7 @@ class Related extends Block
* Get related product element
*
* @param string $productName
- * @return Element
+ * @return SimpleElement
*/
private function getProductElement($productName)
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
index 343786e57ed..743bdae561c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Product\ProductList;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Upsell
@@ -47,7 +47,7 @@ class Upsell extends Block
* Get a the product
*
* @param string $productName
- * @return Element
+ * @return SimpleElement
*/
private function getProductElement($productName)
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
index 7d0a4dba77b..16575c35456 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Block\Product;
use Magento\Catalog\Test\Block\AbstractConfigureBlock;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 8c391709217..8e26c0dc760 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -6,10 +6,10 @@
namespace Magento\Catalog\Test\Block\Product\View;
use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
+use Mtf\Client\Element\SimpleElement;
/**
* Class CustomOptions
@@ -135,7 +135,7 @@ class CustomOptions extends Form
throw new \Exception("Can't find option: \"{$title}\"");
}
- /** @var Element $optionElement */
+ /** @var SimpleElement $optionElement */
$optionElement = $listCustomOptions[$title];
$typeMethod = preg_replace('/[^a-zA-Z]/', '', $option['type']);
$getTypeData = 'get' . ucfirst(strtolower($typeMethod)) . 'Data';
@@ -177,10 +177,10 @@ class CustomOptions extends Form
/**
* Get data of "Field" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getFieldData(Element $option)
+ protected function getFieldData(SimpleElement $option)
{
$price = $this->getOptionPriceNotice($option);
$maxCharacters = $option->find($this->maxCharacters, Locator::SELECTOR_XPATH);
@@ -198,10 +198,10 @@ class CustomOptions extends Form
/**
* Get data of "Area" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getAreaData(Element $option)
+ protected function getAreaData(SimpleElement $option)
{
return $this->getFieldData($option);
}
@@ -209,10 +209,10 @@ class CustomOptions extends Form
/**
* Get data of "File" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getFileData(Element $option)
+ protected function getFileData(SimpleElement $option)
{
$price = $this->getOptionPriceNotice($option);
@@ -231,10 +231,10 @@ class CustomOptions extends Form
/**
* Get data of "Drop-down" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getDropdownData(Element $option)
+ protected function getDropdownData(SimpleElement $option)
{
$select = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'select');
// Skip "Choose option ..."(option #1)
@@ -244,10 +244,10 @@ class CustomOptions extends Form
/**
* Get data of "Multiple Select" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getMultipleSelectData(Element $option)
+ protected function getMultipleSelectData(SimpleElement $option)
{
$multiselect = $option->find($this->selectOption, Locator::SELECTOR_XPATH, 'multiselect');
return $this->getSelectOptionsData($multiselect, 1);
@@ -256,14 +256,15 @@ class CustomOptions extends Form
/**
* Get data of "Radio Buttons" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getRadioButtonsData(Element $option)
+ protected function getRadioButtonsData(SimpleElement $option)
{
$listOptions = [];
$count = 1;
+ /** @var SimpleElement $option */
$option = $option->find(sprintf($this->optionLabel, $count), Locator::SELECTOR_XPATH);
while ($option->isVisible()) {
$listOptions[] = $this->parseOptionText($option->getText());
@@ -279,10 +280,10 @@ class CustomOptions extends Form
/**
* Get data of "Checkbox" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getCheckboxData(Element $option)
+ protected function getCheckboxData(SimpleElement $option)
{
return $this->getRadioButtonsData($option);
}
@@ -290,10 +291,10 @@ class CustomOptions extends Form
/**
* Get data of "Date" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getDateData(Element $option)
+ protected function getDateData(SimpleElement $option)
{
$price = $this->getOptionPriceNotice($option);
@@ -309,10 +310,10 @@ class CustomOptions extends Form
/**
* Get data of "Date & Time" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getDateTimeData(Element $option)
+ protected function getDateTimeData(SimpleElement $option)
{
return $this->getDateData($option);
}
@@ -320,10 +321,10 @@ class CustomOptions extends Form
/**
* Get data of "Time" custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getTimeData(Element $option)
+ protected function getTimeData(SimpleElement $option)
{
return $this->getDateData($option);
}
@@ -331,11 +332,11 @@ class CustomOptions extends Form
/**
* Get data from option of select and multiselect
*
- * @param Element $element
+ * @param SimpleElement $element
* @param int $firstOption
* @return array
*/
- protected function getSelectOptionsData(Element $element, $firstOption = 1)
+ protected function getSelectOptionsData(SimpleElement $element, $firstOption = 1)
{
$listOptions = [];
@@ -355,10 +356,10 @@ class CustomOptions extends Form
/**
* Get price from price-notice of custom option
*
- * @param Element $option
+ * @param SimpleElement $option
* @return array
*/
- protected function getOptionPriceNotice(Element $option)
+ protected function getOptionPriceNotice(SimpleElement $option)
{
$priceNotice = $option->find($this->priceNotice, Locator::SELECTOR_XPATH);
if (!$priceNotice->isVisible()) {
@@ -370,11 +371,11 @@ class CustomOptions extends Form
/**
* Get notice of option by number
*
- * @param Element $option
+ * @param SimpleElement $option
* @param int $number
* @return mixed
*/
- protected function getOptionNotice(Element $option, $number)
+ protected function getOptionNotice(SimpleElement $option, $number)
{
$note = $option->find(sprintf($this->noteByNumber, $number), Locator::SELECTOR_XPATH);
return $note->isVisible() ? $note->getText() : null;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
index 84b180745e9..3630d8fae75 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Search
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 46326d1ee30..b4cee4a16c4 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogCategory;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -28,13 +28,16 @@ class AssertCategoryAbsenceOnFrontend extends AbstractConstraint
/**
* Assert that not displayed category in frontend main menu
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogCategoryView $categoryView
* @param CatalogCategory $category
* @return void
*/
- public function processAssert(Browser $browser, CatalogCategoryView $categoryView, CatalogCategory $category)
- {
+ public function processAssert(
+ BrowserInterface $browser,
+ CatalogCategoryView $categoryView,
+ CatalogCategory $category
+ ) {
$browser->open($_ENV['app_frontend_url'] . $category->getUrlKey() . '.html');
\PHPUnit_Framework_Assert::assertEquals(
self::NOT_FOUND_MESSAGE,
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 166faa8e721..88070abc35a 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogCategory;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -25,11 +25,14 @@ class AssertCategoryForAssignedProducts extends AbstractConstraint
*
* @param CatalogCategory $category
* @param CatalogCategoryView $categoryView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
- public function processAssert(CatalogCategory $category, CatalogCategoryView $categoryView, Browser $browser)
- {
+ public function processAssert(
+ CatalogCategory $category,
+ CatalogCategoryView $categoryView,
+ BrowserInterface $browser
+ ) {
$browser->open($_ENV['app_frontend_url'] . strtolower($category->getUrlKey()) . '.html');
$products = $category->getDataFieldConfig('category_products')['source']->getProducts();
foreach ($products as $productFixture) {
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 ea0f357e3c8..dfd6c54dec5 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogCategory;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -27,10 +27,10 @@ class AssertCategoryIsNotActive extends AbstractConstraint
*
* @param CmsIndex $cmsIndex
* @param CatalogCategory $category
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
- public function processAssert(CmsIndex $cmsIndex, CatalogCategory $category, Browser $browser)
+ public function processAssert(CmsIndex $cmsIndex, CatalogCategory $category, BrowserInterface $browser)
{
$cmsIndex->open();
\PHPUnit_Framework_Assert::assertFalse(
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 1afb66d142f..a0a239fdefb 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogCategory;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -26,14 +26,14 @@ class AssertCategoryIsNotIncludeInMenu extends AbstractConstraint
*
* @param CmsIndex $cmsIndex
* @param CatalogCategory $category
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogCategoryView $categoryView
* @return void
*/
public function processAssert(
CmsIndex $cmsIndex,
CatalogCategory $category,
- Browser $browser,
+ BrowserInterface $browser,
CatalogCategoryView $categoryView
) {
$cmsIndex->open();
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 92b3304b91c..de0766a538a 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogCategory;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureFactory;
@@ -28,7 +28,7 @@ class AssertCategoryPage extends AbstractConstraint
* @param CatalogCategory $initialCategory
* @param FixtureFactory $fixtureFactory
* @param CatalogCategoryView $categoryView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
@@ -36,7 +36,7 @@ class AssertCategoryPage extends AbstractConstraint
CatalogCategory $initialCategory,
FixtureFactory $fixtureFactory,
CatalogCategoryView $categoryView,
- Browser $browser
+ BrowserInterface $browser
) {
$product = $fixtureFactory->createByCode(
'catalogProductSimple',
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 9d8f3987389..88f550b4fe1 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogCategory;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -23,12 +23,15 @@ class AssertCategoryRedirect extends AbstractConstraint
* Assert that old Category URL lead to appropriate Category in frontend
*
* @param CatalogCategory $category
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogCategory $initialCategory
* @return void
*/
- public function processAssert(CatalogCategory $category, Browser $browser, CatalogCategory $initialCategory)
- {
+ public function processAssert(
+ CatalogCategory $category,
+ BrowserInterface $browser,
+ CatalogCategory $initialCategory
+ ) {
$browser->open($_ENV['app_frontend_url'] . $initialCategory->getUrlKey() . '.html');
\PHPUnit_Framework_Assert::assertEquals(
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 2ca88767f48..9c6966cb8df 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\InjectableFixture;
@@ -25,7 +25,7 @@ class AssertCrossSellsProductsSection extends AbstractConstraint
/**
* Assert that product is displayed in cross-sell section
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CheckoutCart $checkoutCart
* @param CatalogProductSimple $product
* @param CatalogProductView $catalogProductView
@@ -33,7 +33,7 @@ class AssertCrossSellsProductsSection extends AbstractConstraint
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
CheckoutCart $checkoutCart,
CatalogProductSimple $product,
CatalogProductView $catalogProductView,
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 765669ef91f..256806320ee 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\InjectableFixture;
@@ -25,7 +25,7 @@ class AssertNoCrossSellsProductsSection extends AbstractConstraint
/**
* Assert that product is not displayed in cross-sell section
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductSimple $product
* @param InjectableFixture[] $relatedProducts
* @param CatalogProductView $catalogProductView
@@ -33,7 +33,7 @@ class AssertNoCrossSellsProductsSection extends AbstractConstraint
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductSimple $product,
array $relatedProducts,
CatalogProductView $catalogProductView,
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 76defe97417..0ac6d8640b8 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\InjectableFixture;
@@ -24,14 +24,14 @@ class AssertNoRelatedProductsSection extends AbstractConstraint
/**
* Assert that product is not displayed in related products section
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductSimple $product
* @param InjectableFixture[] $relatedProducts
* @param CatalogProductView $catalogProductView
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductSimple $product,
array $relatedProducts,
CatalogProductView $catalogProductView
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 e787890abee..7c547019a3f 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\InjectableFixture;
@@ -24,14 +24,14 @@ class AssertNoUpSellsProductsSection extends AbstractConstraint
/**
* Assert that product is not displayed in up-sell section
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductSimple $product
* @param InjectableFixture[] $relatedProducts
* @param CatalogProductView $catalogProductView
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductSimple $product,
array $relatedProducts,
CatalogProductView $catalogProductView
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 8213f53c9c1..db4d12f0b1e 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Driver\Selenium\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\InjectableFixture;
@@ -26,14 +26,14 @@ class AssertProductAttributeDisplayingOnFrontend extends AbstractConstraint
* @param InjectableFixture $product
* @param CatalogProductAttribute $attribute
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
InjectableFixture $product,
CatalogProductAttribute $attribute,
CatalogProductView $catalogProductView,
- Browser $browser
+ BrowserInterface $browser
) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
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 5cdbac2478c..7ba142e6e21 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Driver\Selenium\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\InjectableFixture;
@@ -26,14 +26,14 @@ class AssertProductAttributeIsComparable extends AbstractConstraint
*
* @param InjectableFixture $product
* @param CatalogProductAttribute $attribute
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductView $catalogProductView
* @param CatalogProductCompare $catalogProductCompare
*/
public function processAssert(
InjectableFixture $product,
CatalogProductAttribute $attribute,
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductView $catalogProductView,
CatalogProductCompare $catalogProductCompare
) {
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 b88bea3779a..c8335b667fd 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Driver\Selenium\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\InjectableFixture;
@@ -27,7 +27,7 @@ class AssertProductAttributeIsHtmlAllowed extends AbstractConstraint
* @param InjectableFixture $product
* @param CatalogProductAttribute $attribute
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @throws \Exception
* @return void
*/
@@ -35,7 +35,7 @@ class AssertProductAttributeIsHtmlAllowed extends AbstractConstraint
InjectableFixture $product,
CatalogProductAttribute $attribute,
CatalogProductView $catalogProductView,
- Browser $browser
+ BrowserInterface $browser
) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
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 0e05a29df61..2ad2845a1f6 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureFactory;
@@ -26,11 +26,15 @@ class AssertProductCompareBlockOnCmsPage extends AbstractConstraint
* @param array $products
* @param CmsIndex $cmsIndex
* @param FixtureFactory $fixtureFactory
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
- public function processAssert(array $products, CmsIndex $cmsIndex, FixtureFactory $fixtureFactory, Browser $browser)
- {
+ public function processAssert(
+ array $products,
+ CmsIndex $cmsIndex,
+ FixtureFactory $fixtureFactory,
+ BrowserInterface $browser
+ ) {
$newCmsPage = $fixtureFactory->createByCode('cmsPage', ['dataSet' => '3_column_template']);
$newCmsPage->persist();
$browser->open($_ENV['app_frontend_url'] . $newCmsPage->getIdentifier());
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 c619e0f81e9..810a27105ed 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractAssertForm;
use Mtf\Fixture\FixtureInterface;
@@ -79,11 +79,14 @@ class AssertProductCustomOptionsOnProductPage extends AbstractAssertForm
*
* @param CatalogProductView $catalogProductView
* @param FixtureInterface $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
- public function processAssert(CatalogProductView $catalogProductView, FixtureInterface $product, Browser $browser)
- {
+ public function processAssert(
+ CatalogProductView $catalogProductView,
+ FixtureInterface $product,
+ BrowserInterface $browser
+ ) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
$actualPrice = null;
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 6733686de31..b3707daef89 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Block\Product\View;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureInterface;
@@ -39,11 +39,14 @@ class AssertProductGroupedPriceOnProductPage extends AbstractConstraint implemen
*
* @param CatalogProductView $catalogProductView
* @param FixtureInterface $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
- public function processAssert(CatalogProductView $catalogProductView, FixtureInterface $product, Browser $browser)
- {
+ public function processAssert(
+ CatalogProductView $catalogProductView,
+ FixtureInterface $product,
+ BrowserInterface $browser
+ ) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
//Process assertions
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 b51e91662ee..b2a9685719e 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureInterface;
@@ -27,14 +27,14 @@ class AssertProductInCart extends AbstractConstraint
*
* @param CatalogProductView $catalogProductView
* @param FixtureInterface $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CheckoutCart $checkoutCart
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
FixtureInterface $product,
- Browser $browser,
+ BrowserInterface $browser,
CheckoutCart $checkoutCart
) {
// Add product to cart
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 cf56a590381..fdb20617fed 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureInterface;
@@ -28,12 +28,15 @@ class AssertProductInStock extends AbstractConstraint
* Assert that In Stock status is displayed on product page
*
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param FixtureInterface $product
* @return void
*/
- public function processAssert(CatalogProductView $catalogProductView, Browser $browser, FixtureInterface $product)
- {
+ public function processAssert(
+ CatalogProductView $catalogProductView,
+ BrowserInterface $browser,
+ FixtureInterface $product
+ ) {
// TODO fix initialization url for frontend page
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
\PHPUnit_Framework_Assert::assertEquals(
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 459715d46f9..ff6f264e66b 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
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureInterface;
@@ -59,7 +59,7 @@ class AssertProductIsNotDisplayingOnFrontend extends AbstractConstraint
/**
* Browser
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -78,7 +78,7 @@ class AssertProductIsNotDisplayingOnFrontend extends AbstractConstraint
* @param CatalogCategoryView $catalogCategoryView
* @param CmsIndex $cmsIndex
* @param FixtureInterface|FixtureInterface[] $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogCategory|null $category
*/
public function processAssert(
@@ -87,7 +87,7 @@ class AssertProductIsNotDisplayingOnFrontend extends AbstractConstraint
CatalogCategoryView $catalogCategoryView,
CmsIndex $cmsIndex,
$product,
- Browser $browser,
+ BrowserInterface $browser,
CatalogCategory $category = null
) {
$this->browser = $browser;
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 aa4b008f2ee..1e8f438a989 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureInterface;
@@ -28,12 +28,15 @@ class AssertProductOutOfStock extends AbstractConstraint
* Assert that Out of Stock status is displayed on product page
*
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param FixtureInterface $product
* @return void
*/
- public function processAssert(CatalogProductView $catalogProductView, Browser $browser, FixtureInterface $product)
- {
+ public function processAssert(
+ CatalogProductView $catalogProductView,
+ BrowserInterface $browser,
+ FixtureInterface $product
+ ) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
\PHPUnit_Framework_Assert::assertEquals(
self::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 e46c706950f..7470919ae5a 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractAssertForm;
use Mtf\Fixture\FixtureInterface;
@@ -44,13 +44,16 @@ class AssertProductPage extends AbstractAssertForm
* 5. Description
* 6. Short Description
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductView $catalogProductView
* @param FixtureInterface $product
* @return void
*/
- public function processAssert(Browser $browser, CatalogProductView $catalogProductView, FixtureInterface $product)
- {
+ public function processAssert(
+ BrowserInterface $browser,
+ CatalogProductView $catalogProductView,
+ FixtureInterface $product
+ ) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
$this->product = $product;
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 35e6507222d..3d997e10abc 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Block\Product\View;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureInterface;
@@ -31,12 +31,15 @@ class AssertProductSpecialPriceOnProductPage extends AbstractConstraint implemen
* Assert that displayed special price on product page equals passed from fixture
*
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param FixtureInterface $product
* @return void
*/
- public function processAssert(CatalogProductView $catalogProductView, Browser $browser, FixtureInterface $product)
- {
+ public function processAssert(
+ CatalogProductView $catalogProductView,
+ BrowserInterface $browser,
+ FixtureInterface $product
+ ) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
//Process assertions
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 252b0a6454c..3f770590c88 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Block\Product\View;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureInterface;
@@ -37,13 +37,13 @@ class AssertProductTierPriceOnProductPage extends AbstractConstraint implements
/**
* Assertion that tier prices are displayed correctly
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductView $catalogProductView
* @param FixtureInterface $product
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductView $catalogProductView,
FixtureInterface $product
) {
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 806c7be578f..c20344a5c67 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
@@ -7,13 +7,11 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductView
- *
- * @package Magento\Catalog\Test\Constraint
*/
class AssertProductView extends AbstractConstraint
{
@@ -23,13 +21,13 @@ class AssertProductView extends AbstractConstraint
/**
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductSimple $product
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductSimple $product
) {
//Open product view page
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 91f38bcd8c3..fe18bbf244a 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
@@ -7,7 +7,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\InjectableFixture;
@@ -24,14 +24,14 @@ class AssertRelatedProductsSection extends AbstractConstraint
/**
* Assert that product is displayed in related products section
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductSimple $product
* @param InjectableFixture[] $relatedProducts
* @param CatalogProductView $catalogProductView
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductSimple $product,
array $relatedProducts,
CatalogProductView $catalogProductView
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 a9bc575d105..f0887a60c2b 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
@@ -24,14 +24,14 @@ class AssertUpSellsProductsSection extends AbstractConstraint
/**
* Assert that product is displayed in up-sell section
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param FixtureInterface $product
* @param InjectableFixture[] $relatedProducts,
* @param CatalogProductView $catalogProductView
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
FixtureInterface $product,
array $relatedProducts,
CatalogProductView $catalogProductView
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
index 87402b3870c..110f4df6a33 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
@@ -5,7 +5,7 @@
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Fixture\DataFixture;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
index 94958ec16fa..50dfcc42995 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
@@ -5,7 +5,7 @@
namespace Magento\Catalog\Test\Page\Category;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Page\Page;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
index 79f79d8bf78..9f675641ee8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Page\Category;
use Magento\Backend\Test\Block\FormPageActions;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Page\Page;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
index 89f6ec20585..ba94f472976 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
@@ -5,7 +5,7 @@
namespace Magento\Catalog\Test\Page\Product;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Page\Page;
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 96916f5d25f..a6e69a5c091 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
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountLogin;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureFactory;
use Mtf\Fixture\InjectableFixture;
@@ -40,7 +40,7 @@ abstract class AbstractCompareProductsTest extends Injectable
/**
* Browser.
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -98,14 +98,14 @@ abstract class AbstractCompareProductsTest extends Injectable
*
* @param CmsIndex $cmsIndex
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CustomerAccountLogin $customerAccountLogin
* @return void
*/
public function __inject(
CmsIndex $cmsIndex,
CatalogProductView $catalogProductView,
- Browser $browser,
+ BrowserInterface $browser,
CustomerAccountLogin $customerAccountLogin
) {
$this->cmsIndex = $cmsIndex;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
index f418c0e7486..77faebc6daa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
@@ -5,7 +5,7 @@
namespace Magento\Catalog\Test\TestStep;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\TestStep\TestStepInterface;
/**
@@ -23,7 +23,7 @@ class OpenProductsOnFrontendStep implements TestStepInterface
/**
* Browser.
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -32,9 +32,9 @@ class OpenProductsOnFrontendStep implements TestStepInterface
*
* @constructor
* @param array $products
- * @param Browser $browser
+ * @param BrowserInterface $browser
*/
- public function __construct(array $products, Browser $browser)
+ public function __construct(array $products, BrowserInterface $browser)
{
$this->products = $products;
$this->browser = $browser;
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 3390387e585..439e4603cbc 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
@@ -5,9 +5,9 @@
namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
/**
* Backend catalog price rule grid.
@@ -60,7 +60,7 @@ class Catalog extends Grid
* Return row with given catalog price rule name.
*
* @param string $ruleName
- * @return Element
+ * @return SimpleElement
*/
public function getGridRow($ruleName)
{
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
index bfa8d3a4e13..6fdd9646959 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
@@ -6,6 +6,7 @@
namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit;
use Magento\Backend\Test\Block\Widget\FormTabs;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
use Mtf\Fixture\FixtureInterface;
@@ -19,11 +20,11 @@ class PromoForm extends FormTabs
* Fill form with tabs
*
* @param FixtureInterface $fixture
- * @param Element $element
+ * @param SimpleElement $element
* @param array $replace
* @return $this|FormTabs
*/
- public function fill(FixtureInterface $fixture, Element $element = null, array $replace = null)
+ public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
{
$tabs = $this->getFieldsByTabs($fixture);
if ($replace) {
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
index d31b30b1a68..4857d519312 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -5,9 +5,9 @@
namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit\Tab;
-use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
use Mtf\Factory\Factory;
+use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Conditions
@@ -27,10 +27,10 @@ class Conditions extends Tab
* Fill condition options
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return void
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
$data = $this->dataMapping($fields);
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
index e4717f9ff45..9cccfa934ef 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
@@ -5,7 +5,7 @@
namespace Magento\CatalogRule\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Conditions
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
index d59d0487c33..813671d632f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
@@ -7,8 +7,9 @@ namespace Magento\CatalogSearch\Test\Block\Advanced;
use Mtf\Block\Form as ParentForm;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
+use Mtf\Client\Element\SimpleElement;
/**
* Advanced search form.
@@ -57,10 +58,10 @@ class Form extends ParentForm
* Fill the root form.
*
* @param FixtureInterface $fixture
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fill(FixtureInterface $fixture, Element $element = null)
+ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
{
// Prepare price data
$data = $fixture->getData();
@@ -82,9 +83,9 @@ class Form extends ParentForm
*
* @param FixtureInterface $fixture
* @param array $fields
- * @param Element $element
+ * @param SimpleElement $element
*/
- public function fillCustom(FixtureInterface $fixture, array $fields, Element $element = null)
+ public function fillCustom(FixtureInterface $fixture, array $fields, SimpleElement $element = null)
{
$data = $fixture->getData('fields');
$dataForMapping = array_intersect_key($data, array_flip($fields));
@@ -100,7 +101,7 @@ class Form extends ParentForm
public function getFormLabels()
{
$labels = [];
- $elements = $this->_rootElement->find($this->fieldSelector, Locator::SELECTOR_XPATH)->getElements();
+ $elements = $this->_rootElement->getElements($this->fieldSelector, Locator::SELECTOR_XPATH);
foreach ($elements as $element) {
$labels[] = $element->find($this->labelSelector)->getText();
}
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
index b093cc2ca22..9ff82fa6eeb 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogSearch\Test\Block\Advanced;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Result
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 1078c8628cc..54a80844ecb 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
@@ -6,7 +6,7 @@
namespace Magento\CatalogSearch\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -24,14 +24,14 @@ class AssertSearchSynonymMassActionNotOnFrontend extends AbstractConstraint
*
* @param array $searchTerms
* @param CmsIndex $cmsIndex
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param AssertSearchSynonymNotOnFrontend $assertSearchSynonymNotOnFrontend
* @return void
*/
public function processAssert(
array $searchTerms,
CmsIndex $cmsIndex,
- Browser $browser,
+ BrowserInterface $browser,
AssertSearchSynonymNotOnFrontend $assertSearchSynonymNotOnFrontend
) {
foreach ($searchTerms as $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 66a345529c2..4b71d74ea30 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
@@ -7,7 +7,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -25,10 +25,10 @@ class AssertSearchSynonymNotOnFrontend extends AbstractConstraint
*
* @param CmsIndex $cmsIndex
* @param CatalogSearchQuery $searchTerm
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
- public function processAssert(CmsIndex $cmsIndex, Browser $browser, CatalogSearchQuery $searchTerm)
+ public function processAssert(CmsIndex $cmsIndex, BrowserInterface $browser, CatalogSearchQuery $searchTerm)
{
$cmsIndex->open()->getSearchBlock()->search($searchTerm->getSynonymFor());
\PHPUnit_Framework_Assert::assertNotEquals(
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 5571ccc2f8f..0be6dc36494 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
@@ -7,7 +7,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -25,14 +25,14 @@ class AssertSearchTermMassActionNotOnFrontend extends AbstractConstraint
*
* @param array $searchTerms
* @param CmsIndex $cmsIndex
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param AssertSearchTermNotOnFrontend $assertSearchTermNotOnFrontend
* @return void
*/
public function processAssert(
array $searchTerms,
CmsIndex $cmsIndex,
- Browser $browser,
+ BrowserInterface $browser,
AssertSearchTermNotOnFrontend $assertSearchTermNotOnFrontend
) {
foreach ($searchTerms as $term) {
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 581cd1488e9..67a1ac719ef 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
@@ -7,7 +7,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -25,10 +25,10 @@ class AssertSearchTermNotOnFrontend extends AbstractConstraint
*
* @param CmsIndex $cmsIndex
* @param CatalogSearchQuery $searchTerm
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
- public function processAssert(CmsIndex $cmsIndex, Browser $browser, CatalogSearchQuery $searchTerm)
+ public function processAssert(CmsIndex $cmsIndex, BrowserInterface $browser, CatalogSearchQuery $searchTerm)
{
$queryText = $searchTerm->getQueryText();
$cmsIndex->open()->getSearchBlock()->search($queryText);
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 49f557382be..99bf74dd791 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
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\Catalog\Test\Block\Search;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -37,10 +37,10 @@ class AssertSearchTermOnFrontend extends AbstractConstraint
*
* @param CmsIndex $cmsIndex
* @param CatalogSearchQuery $searchTerm
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
- public function processAssert(CmsIndex $cmsIndex, CatalogSearchQuery $searchTerm, Browser $browser)
+ public function processAssert(CmsIndex $cmsIndex, CatalogSearchQuery $searchTerm, BrowserInterface $browser)
{
$errors = [];
$this->searchBlock = $cmsIndex->open()->getSearchBlock();
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 d8684a2ec58..3c40c98beeb 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
@@ -7,7 +7,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -24,11 +24,11 @@ class AssertSearchTermSynonymOnFrontend extends AbstractConstraint
* Assert that you will be redirected to url from dataset
*
* @param CmsIndex $cmsIndex
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogSearchQuery $searchTerm
* @return void
*/
- public function processAssert(CmsIndex $cmsIndex, Browser $browser, CatalogSearchQuery $searchTerm)
+ public function processAssert(CmsIndex $cmsIndex, BrowserInterface $browser, CatalogSearchQuery $searchTerm)
{
$cmsIndex->open()->getSearchBlock()->search($searchTerm->getSynonymFor());
$windowUrl = $browser->getUrl();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
index 30faffaeb64..058349c2f15 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
@@ -9,7 +9,7 @@ use Exception;
use Magento\Checkout\Test\Block\Cart\CartItem;
use Magento\Checkout\Test\Block\Onepage\Link;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Fixture\FixtureInterface;
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
index 646575bc8ac..b0e54a740d0 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
@@ -6,7 +6,7 @@
namespace Magento\Checkout\Test\Block\Cart;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class CartEmpty
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 c16fd46bb96..1e78edd0780 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
@@ -5,7 +5,7 @@
namespace Magento\Checkout\Test\Block\Cart;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class CartItem
@@ -141,8 +141,8 @@ class CartItem extends AbstractCartItem
$options = [];
if ($optionsBlock->isVisible()) {
- $titles = $optionsBlock->find('./dt', Locator::SELECTOR_XPATH)->getElements();
- $values = $optionsBlock->find('./dd', Locator::SELECTOR_XPATH)->getElements();
+ $titles = $optionsBlock->getElements('./dt', Locator::SELECTOR_XPATH);
+ $values = $optionsBlock->getElements('./dd', Locator::SELECTOR_XPATH);
foreach ($titles as $key => $title) {
$value = $values[$key]->getText();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
index 8a7e99cdf1f..189344602a8 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
@@ -6,7 +6,7 @@
namespace Magento\Checkout\Test\Block\Cart;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class DiscountCodes
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
index f5f589cfcfb..fe5dcd6d268 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
@@ -7,7 +7,7 @@ namespace Magento\Checkout\Test\Block\Cart;
use Magento\Customer\Test\Fixture\AddressInjectable;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Shipping
@@ -124,6 +124,7 @@ class Shipping extends Form
}
);
$selector = sprintf($this->shippingMethod, $carrier, $method);
+
return $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
index 1faf993de18..40355e4c663 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
@@ -6,7 +6,7 @@ namespace Magento\Checkout\Test\Block\Cart;
use Magento\Checkout\Test\Block\Cart\Sidebar\Item;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php
index 52ddfc86a04..320955b1141 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php
@@ -35,7 +35,7 @@ class Item extends Sidebar
public function removeItemFromMiniCart()
{
$this->_rootElement->find($this->removeItem)->click();
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
}
/**
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 a9db2d56823..70a31fd6d4e 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
@@ -6,7 +6,7 @@
namespace Magento\Checkout\Test\Block\Cart;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Totals
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 c3bf38ed68b..da3a27e72b3 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
@@ -7,7 +7,7 @@ namespace Magento\Checkout\Test\Constraint;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -30,10 +30,10 @@ class AssertCartIsEmpty extends AbstractConstraint
* Click here to continue shopping." where 'here' is link that leads to index page
*
* @param CheckoutCart $checkoutCart
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
- public function processAssert(CheckoutCart $checkoutCart, Browser $browser)
+ public function processAssert(CheckoutCart $checkoutCart, BrowserInterface $browser)
{
$checkoutCart->open();
$cartEmptyBlock = $checkoutCart->getCartEmptyBlock();
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
index 9d46030727d..f010fa5f8a6 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
@@ -7,7 +7,7 @@ namespace Magento\Checkout\Test\TestCase;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Fixture\FixtureFactory;
use Mtf\ObjectManager;
use Mtf\TestCase\Injectable;
@@ -34,7 +34,7 @@ class AddProductsToShoppingCartEntityTest extends Injectable
/**
* Browser interface
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -62,14 +62,14 @@ class AddProductsToShoppingCartEntityTest extends Injectable
/**
* Prepare test data
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param FixtureFactory $fixtureFactory
* @param CatalogProductView $catalogProductView
* @param CheckoutCart $cartPage
* @return void
*/
public function __prepare(
- Browser $browser,
+ BrowserInterface $browser,
FixtureFactory $fixtureFactory,
CatalogProductView $catalogProductView,
CheckoutCart $cartPage
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
index 6e2760eb681..f61c1ef1d3f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
@@ -7,7 +7,7 @@ namespace Magento\Checkout\Test\TestCase;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Fixture\FixtureFactory;
use Mtf\Fixture\InjectableFixture;
use Mtf\ObjectManager;
@@ -33,7 +33,7 @@ class DeleteProductsFromShoppingCartTest extends Injectable
/**
* Browser interface
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -61,14 +61,14 @@ class DeleteProductsFromShoppingCartTest extends Injectable
/**
* Prepare test data
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param FixtureFactory $fixtureFactory
* @param CatalogProductView $catalogProductView
* @param CheckoutCart $cartPage
* @return void
*/
public function __prepare(
- Browser $browser,
+ BrowserInterface $browser,
FixtureFactory $fixtureFactory,
CatalogProductView $catalogProductView,
CheckoutCart $cartPage
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
index 31aa86e5375..fefbde92170 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Fixture\FixtureFactory;
use Mtf\TestCase\Injectable;
@@ -36,7 +36,7 @@ class UpdateShoppingCartTest extends Injectable
/**
* Browser interface
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -64,11 +64,11 @@ class UpdateShoppingCartTest extends Injectable
/**
* Prepare test data
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param FixtureFactory $fixtureFactory
* @return void
*/
- public function __prepare(Browser $browser, FixtureFactory $fixtureFactory)
+ public function __prepare(BrowserInterface $browser, FixtureFactory $fixtureFactory)
{
$this->browser = $browser;
$this->fixtureFactory = $fixtureFactory;
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
index db5bc04ced6..012404e0489 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
@@ -8,7 +8,7 @@ namespace Magento\Checkout\Test\TestStep;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\TestStep\TestStepInterface;
/**
@@ -48,7 +48,7 @@ class AddProductsToTheCartStep implements TestStepInterface
/**
* Interface Browser
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -57,14 +57,14 @@ class AddProductsToTheCartStep implements TestStepInterface
* @param CatalogProductView $catalogProductView
* @param CheckoutCart $checkoutCart
* @param CmsIndex $cmsIndex
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param array $products
*/
public function __construct(
CatalogProductView $catalogProductView,
CheckoutCart $checkoutCart,
CmsIndex $cmsIndex,
- Browser $browser,
+ BrowserInterface $browser,
array $products
) {
$this->products = $products;
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
index a65799fc342..4bb9908e00a 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
@@ -5,10 +5,11 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
-use Magento\Backend\Test\Block\Widget\Form as ParentForm;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
+use Mtf\Client\Element\SimpleElement;
+use Magento\Backend\Test\Block\Widget\Form as ParentForm;
/**
* Class AffectedAttributeSet
@@ -34,10 +35,10 @@ class AffectedAttributeSet extends ParentForm
* Fill popup form
*
* @param FixtureInterface $product
- * @param Element|null $element [optional]
+ * @param SimpleElement|null $element [optional]
* @return $this
*/
- public function fill(FixtureInterface $product, Element $element = null)
+ public function fill(FixtureInterface $product, SimpleElement $element = null)
{
$affectedAttributeSet = $product->getData('affected_attribute_set');
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
index 00c91537f98..606cebfdb81 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
@@ -7,8 +7,10 @@ namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Supe
use Magento\Backend\Test\Block\Template;
use Magento\Backend\Test\Block\Widget\Tab;
+use Magento\Catalog\Test\Fixture\CatalogCategory;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Config
@@ -83,10 +85,10 @@ class Config extends Tab
* Fill variations fieldset
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
$attributes = isset($fields['configurable_attributes_data']['value'])
? $fields['configurable_attributes_data']['value']
@@ -174,10 +176,10 @@ class Config extends Tab
* Get data of tab
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
$data = [];
@@ -195,7 +197,7 @@ class Config extends Tab
*/
public function deleteAttributes()
{
- $attributeElements = $this->_rootElement->find($this->attributeElement)->getElements();
+ $attributeElements = $this->_rootElement->getElements($this->attributeElement);
$this->_rootElement->find($this->variationsContent)->click();
foreach ($attributeElements as $element) {
$element->find($this->deleteVariationButton)->click();
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
index 110deade25b..dd192900234 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
@@ -5,10 +5,10 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
+use Mtf\Client\Locator;
use Magento\Backend\Test\Block\Widget\Form;
+use Mtf\Client\Element\SimpleElement;
use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute\AttributeSelector;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
/**
* Attribute block in Variation section.
@@ -252,11 +252,11 @@ class Attribute extends Form
/**
* Check is visible option
*
- * @param Element $attributeBlock
+ * @param SimpleElement $attributeBlock
* @param int $number
* @return bool
*/
- protected function isVisibleOption(Element $attributeBlock, $number)
+ protected function isVisibleOption(SimpleElement $attributeBlock, $number)
{
return $attributeBlock->find(
sprintf($this->optionContainerByNumber, $number),
@@ -302,7 +302,7 @@ class Attribute extends Form
$optionMapping = $this->dataMapping();
$count = 1;
- /** @var Element $attributeBlock */
+ /** @var SimpleElement $attributeBlock */
$attributeBlock = $this->_rootElement->find(sprintf($this->attributeBlock, $count), Locator::SELECTOR_XPATH);
while ($attributeBlock->isVisible()) {
$this->showAttributeContent($attributeBlock);
@@ -311,9 +311,9 @@ class Attribute extends Form
'label' => $attributeBlock->find($this->attributeLabel)->getValue(),
'options' => [],
];
- $options = $attributeBlock->find($this->optionContainer, Locator::SELECTOR_XPATH)->getElements();
+ $options = $attributeBlock->getElements($this->optionContainer, Locator::SELECTOR_XPATH);
foreach ($options as $optionKey => $option) {
- /** @var Element $option */
+ /** @var SimpleElement $option */
if ($option->isVisible()) {
$attribute['options'][$optionKey] = $this->_getData($optionMapping, $option);
$attribute['options'][$optionKey] += $this->getOptionalFields($option);
@@ -334,10 +334,10 @@ class Attribute extends Form
/**
* Show attribute content
*
- * @param Element $attribute
+ * @param SimpleElement $attribute
* @return void
*/
- protected function showAttributeContent(Element $attribute)
+ protected function showAttributeContent(SimpleElement $attribute)
{
if (!$attribute->find($this->attributeContent)->isVisible()) {
$this->_rootElement->find($this->configContent)->click();
@@ -370,11 +370,11 @@ class Attribute extends Form
/**
* Get optional fields
*
- * @param Element $context
+ * @param SimpleElement $context
* @param array $fields
* @return array
*/
- protected function getOptionalFields(Element $context, array $fields = [])
+ protected function getOptionalFields(SimpleElement $context, array $fields = [])
{
$data = [];
@@ -382,6 +382,7 @@ class Attribute extends Form
foreach ($fields as $name => $params) {
$data[$name] = $context->find($params['selector'], $params['strategy'])->getText();
}
+
return $data;
}
}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
index 3e63f4ab107..18b1892810c 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
@@ -5,8 +5,8 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute;
+use Mtf\Client\Element\SuggestElement;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Driver\Selenium\Element\SuggestElement;
/**
* Class AttributeSelector
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
index 59222986416..64dd4eb2d1a 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
@@ -5,14 +5,14 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Element\SimpleElement;
+use Mtf\Client\Locator;
/**
* Class ToggleDropdown
* Class for toggle dropdown elements.
*/
-class ToggleDropdown extends Element
+class ToggleDropdown extends SimpleElement
{
/**
* Selector for field value
@@ -43,7 +43,7 @@ class ToggleDropdown extends Element
*/
public function setValue($value)
{
- $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+ $this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
if ($value != $this->getValue()) {
$value = ('Yes' == $value) ? '%' : '$';
@@ -61,7 +61,7 @@ class ToggleDropdown extends Element
*/
public function getValue()
{
- $this->_eventManager->dispatchEvent(['get_value'], [(string)$this->_locator]);
+ $this->eventManager->dispatchEvent(['get_value'], [__METHOD__, $this->getAbsoluteSelector()]);
$value = $this->find($this->field, Locator::SELECTOR_XPATH)->getText();
return ('%' == $value) ? 'Yes' : 'No';
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
index b90a8272d74..6bffd1a9ef2 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
@@ -5,10 +5,10 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
+use Mtf\Client\Locator;
use Magento\Backend\Test\Block\Template;
use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Matrix
@@ -119,11 +119,11 @@ class Matrix extends Form
/**
* Assign product to variation matrix
*
- * @param Element $variationRow
+ * @param SimpleElement $variationRow
* @param int $productId
* @return void
*/
- protected function assignProduct(Element $variationRow, $productId)
+ protected function assignProduct(SimpleElement $variationRow, $productId)
{
$variationRow->find($this->configurableAttribute)->click();
$this->getTemplateBlock()->waitLoader();
@@ -141,10 +141,10 @@ class Matrix extends Form
public function getVariationsData()
{
$data = [];
- $variationRows = $this->_rootElement->find($this->variationRow, Locator::SELECTOR_XPATH)->getElements();
+ $variationRows = $this->_rootElement->getElements($this->variationRow, Locator::SELECTOR_XPATH);
foreach ($variationRows as $key => $variationRow) {
- /** @var Element $variationRow */
+ /** @var SimpleElement $variationRow */
if ($variationRow->isVisible()) {
$data[$key] = $this->_getData($this->dataMapping(), $variationRow);
$data[$key] += $this->getOptionalFields($variationRow, $this->mappingGetFields);
@@ -157,11 +157,11 @@ class Matrix extends Form
/**
* Get optional fields
*
- * @param Element $context
+ * @param SimpleElement $context
* @param array $fields
* @return array
*/
- protected function getOptionalFields(Element $context, array $fields)
+ protected function getOptionalFields(SimpleElement $context, array $fields)
{
$data = [];
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
index 37c61cc8936..b904c192714 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
@@ -5,7 +5,7 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
index 6b1ffba1b60..5c5aa4eae10 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
@@ -5,11 +5,12 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
-use Magento\Backend\Test\Block\Widget\FormTabs;
use Mtf\Client\Element;
use Mtf\Fixture\DataFixture;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
+use Magento\Backend\Test\Block\Widget\FormTabs;
+use Mtf\Client\Element\SimpleElement;
/**
* Class ProductForm
@@ -21,11 +22,11 @@ class ProductForm extends \Magento\Catalog\Test\Block\Adminhtml\Product\ProductF
* Fill the product form
*
* @param FixtureInterface $product
- * @param Element|null $element [optional]
+ * @param SimpleElement|null $element [optional]
* @param FixtureInterface|null $category [optional]
* @return FormTabs
*/
- public function fill(FixtureInterface $product, Element $element = null, FixtureInterface $category = null)
+ public function fill(FixtureInterface $product, SimpleElement $element = null, FixtureInterface $category = null)
{
$tabs = $this->getFieldsByTabs($product);
ksort($tabs);
@@ -100,6 +101,7 @@ class ProductForm extends \Magento\Catalog\Test\Block\Adminhtml\Product\ProductF
],
];
unset($tabs['variations']['variations-matrix']);
+
return $tabs;
}
}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
index 6c8ed2954f9..66ef86fdad9 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
@@ -9,9 +9,10 @@ use Magento\Catalog\Test\Block\Product\View\CustomOptions;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
+use Mtf\Client\Element\SimpleElement;
/**
* Class ConfigurableOptions
@@ -60,7 +61,7 @@ class ConfigurableOptions extends CustomOptions
throw new \Exception("Can't find option: \"{$title}\"");
}
- /** @var Element $optionElement */
+ /** @var SimpleElement $optionElement */
$optionElement = $listOptions[$title];
$typeMethod = preg_replace('/[^a-zA-Z]/', '', $option['frontend_input']);
$getTypeData = 'get' . ucfirst(strtolower($typeMethod)) . 'Data';
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 59a23c1e9e1..1e5977e84a1 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
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -24,14 +24,14 @@ class AssertConfigurableAttributesAbsentOnProductPage extends AbstractConstraint
* Assert that deleted configurable attributes are absent on product page on frontend.
*
* @param CatalogProductAttribute[] $deletedProductAttributes
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductView $catalogProductView
* @param ConfigurableProductInjectable $product
* @return void
*/
public function processAssert(
array $deletedProductAttributes,
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductView $catalogProductView,
ConfigurableProductInjectable $product
) {
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 4c565a23255..b9fd634d122 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
@@ -7,7 +7,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -22,13 +22,13 @@ class AssertConfigurableAttributesBlockIsAbsentOnProductPage extends AbstractCon
/**
* Assert that all configurable attributes is absent on product page on frontend.
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductView $catalogProductView
* @param ConfigurableProductInjectable $product
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductView $catalogProductView,
ConfigurableProductInjectable $product
) {
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
index 48db2e848a0..660e88d7ea1 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -20,14 +20,14 @@ class AssertConfigurableProductInCart extends AbstractConstraint
/**
* Assertion that the product is correctly displayed in cart
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductView $catalogProductView
* @param CheckoutCart $checkoutCart
* @param ConfigurableProductInjectable $product
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductView $catalogProductView,
CheckoutCart $checkoutCart,
ConfigurableProductInjectable $product
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
index 8b85b0a7ba9..0cca7671803 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
@@ -6,7 +6,7 @@
namespace Magento\Core\Test\Block\Adminhtml\System\Variable;
use Magento\Backend\Test\Block\FormPageActions as AbstractFormPageActions;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class FormPageActions
@@ -40,7 +40,7 @@ class FormPageActions extends AbstractFormPageActions
*
* @param string $storeName
* @throws \Exception
- * @return void|bool
+ * @return null|bool
*/
public function selectStoreView($storeName)
{
@@ -56,6 +56,8 @@ class FormPageActions extends AbstractFormPageActions
} else {
throw new \Exception('Store View with name \'' . $storeName . '\' is not visible!');
}
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
+
+ return null;
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
index 03b780e9f57..ff29b806b02 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
@@ -6,7 +6,7 @@
namespace Magento\Core\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Global messages block
@@ -67,7 +67,7 @@ class Messages extends Block
public function getSuccessMessages()
{
$this->waitForElementVisible($this->successMessage);
- $elements = $this->_rootElement->find($this->successMessage)->getElements();
+ $elements = $this->_rootElement->getElements($this->successMessage);
$messages = [];
foreach ($elements as $key => $element) {
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 62b2df94d02..0203036a83d 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
@@ -8,7 +8,7 @@ namespace Magento\Core\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Core\Test\Fixture\SystemVariable;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureFactory;
@@ -29,7 +29,7 @@ class AssertCustomVariableInPage extends AbstractConstraint
* @param CmsIndex $cmsIndex
* @param SystemVariable $variable
* @param FixtureFactory $fixtureFactory
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param Store $storeOrigin
* @param SystemVariable $customVariableOrigin
* @return void
@@ -39,7 +39,7 @@ class AssertCustomVariableInPage extends AbstractConstraint
CmsIndex $cmsIndex,
SystemVariable $variable,
FixtureFactory $fixtureFactory,
- Browser $browser,
+ BrowserInterface $browser,
Store $storeOrigin = null,
SystemVariable $customVariableOrigin = null
) {
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
index a894d53abdd..2d3edd06fc4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
@@ -7,7 +7,7 @@ namespace Magento\Customer\Test\Block\Account;
use Magento\Customer\Test\Fixture\AddressInjectable;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class AddressesAdditional
@@ -46,7 +46,7 @@ class AddressesAdditional extends Block
{
$this->_rootElement->find(sprintf($this->addressSelector, $address->getStreet()), Locator::SELECTOR_XPATH)
->find($this->deleteAddressLink)->click();
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
index c591574604d..01d1b965c5f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Block\Account;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Addresses default block
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
index 81e7271a849..8bdf701dab2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Block\Account;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
index 7a597a4066d..3255347997e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
@@ -7,7 +7,7 @@ namespace Magento\Customer\Test\Block\Address;
use Magento\Customer\Test\Fixture\Address;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Edit
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 3fa6c1f373f..e883760e668 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
@@ -7,8 +7,9 @@ namespace Magento\Customer\Test\Block\Adminhtml\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Customer\Test\Fixture\AddressInjectable;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
@@ -145,12 +146,12 @@ class Addresses extends Tab
* Get data to fields on tab
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
/* Skip get data for standard method. Use getDataAddresses. */
return [];
@@ -195,6 +196,7 @@ class Addresses extends Tab
sprintf($this->customerAddress, $addressNumber),
Locator::SELECTOR_XPATH
);
+
return $addressTab->isVisible();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
index c9846e6c5bf..583437b2e07 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
@@ -7,7 +7,7 @@ namespace Magento\Customer\Test\Block\Form;
use Magento\Customer\Test\Fixture\Customer;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
*/
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
index 722b8c39bcb..41b87f26fdf 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Block\Form;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
index 9bb5b47c3a3..4bdd2c45112 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Block\Form;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
index 0491371ccb7..1964ff74ffa 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Page\Address;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Page\Page;
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
index fd8d343964c..9add30d974a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
@@ -5,7 +5,7 @@
namespace Magento\Customer\Test\Page;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Page\Page;
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
index 5086f2db15b..f435d901245 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Page;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Page\Page;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index d268dd4d123..0d2edcd63f0 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -5,9 +5,10 @@
namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab;
-use Magento\Backend\Test\Block\Widget\Tab;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Downloadable
@@ -34,11 +35,11 @@ class Downloadable extends Tab
* Get Downloadable block
*
* @param string $type
- * @param Element $element
+ * @param SimpleElement $element
* @return \Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable\Samples |
* \Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable\Links
*/
- public function getDownloadableBlock($type, Element $element = null)
+ public function getDownloadableBlock($type, SimpleElement $element = null)
{
$element = $element ?: $this->_rootElement;
return $this->blockFactory->create(
@@ -51,10 +52,10 @@ class Downloadable extends Tab
* Get data to fields on downloadable tab
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
$newFields = [];
if (isset($fields['downloadable_sample']['value'])) {
@@ -75,10 +76,10 @@ class Downloadable extends Tab
* Fill downloadable information
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
if (isset($fields['downloadable_sample']['value'])) {
$this->getDownloadableBlock('Samples')->fillSamples($fields['downloadable_sample']['value']);
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 3900d11e868..67b891de896 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -5,8 +5,8 @@
namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Links
@@ -54,10 +54,10 @@ class Links extends Form
* Get Downloadable link item block
*
* @param int $index
- * @param Element $element
+ * @param SimpleElement $element
* @return LinkRow
*/
- public function getRowBlock($index, Element $element = null)
+ public function getRowBlock($index, SimpleElement $element = null)
{
$element = $element ?: $this->_rootElement;
return $this->blockFactory->create(
@@ -70,10 +70,10 @@ class Links extends Form
* Fill links block
*
* @param array $fields
- * @param Element $element
+ * @param SimpleElement $element
* @return void
*/
- public function fillLinks(array $fields, Element $element = null)
+ public function fillLinks(array $fields, SimpleElement $element = null)
{
$element = $element ?: $this->_rootElement;
if (!$element->find($this->title, Locator::SELECTOR_XPATH)->isVisible()) {
@@ -97,10 +97,10 @@ class Links extends Form
* Get data links block
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataLinks(array $fields = null, Element $element = null)
+ public function getDataLinks(array $fields = null, SimpleElement $element = null)
{
$element = $element ?: $this->_rootElement;
if (!$element->find($this->title, Locator::SELECTOR_XPATH)->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 2c277cbaac4..29c7e7f2baa 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -5,8 +5,8 @@
namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class SampleRow
@@ -47,10 +47,10 @@ class Samples extends Form
* Get Downloadable sample item block
*
* @param int $index
- * @param Element $element
+ * @param SimpleElement $element
* @return SampleRow
*/
- public function getRowBlock($index, Element $element = null)
+ public function getRowBlock($index, SimpleElement $element = null)
{
$element = $element ?: $this->_rootElement;
return $this->blockFactory->create(
@@ -63,10 +63,10 @@ class Samples extends Form
* Fill samples block
*
* @param array|null $fields
- * @param Element $element
+ * @param SimpleElement $element
* @return void
*/
- public function fillSamples(array $fields = null, Element $element = null)
+ public function fillSamples(array $fields = null, SimpleElement $element = null)
{
$element = $element ?: $this->_rootElement;
if (!$element->find($this->samplesTitle, Locator::SELECTOR_XPATH)->isVisible()) {
@@ -84,10 +84,10 @@ class Samples extends Form
* Get data samples block
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataSamples(array $fields = null, Element $element = null)
+ public function getDataSamples(array $fields = null, SimpleElement $element = null)
{
$element = $element ?: $this->_rootElement;
if (!$element->find($this->samplesTitle, Locator::SELECTOR_XPATH)->isVisible()) {
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
index 8824072b6ba..5e1fc5de16c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\Block\Catalog\Product;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
index fbe555145b6..b704710b07f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\Block\Catalog\Product\View;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Links
@@ -109,7 +109,7 @@ class Links extends Block
{
$linksData = [];
- $choiceLinks = $this->_rootElement->find($this->choiceLink, Locator::SELECTOR_XPATH)->getElements();
+ $choiceLinks = $this->_rootElement->getElements($this->choiceLink, Locator::SELECTOR_XPATH);
foreach ($choiceLinks as $choiceLink) {
$link = $choiceLink->find($this->linkForChoice);
$sample = $choiceLink->find($this->sampleLinkForChoice);
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
index 8d7dd461b92..870f980500e 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
@@ -45,7 +45,7 @@ class Samples extends Block
*/
public function getLinks()
{
- $links = $this->_rootElement->find($this->linkTitle)->getElements();
+ $links = $this->_rootElement->getElements($this->linkTitle);
$linksData = [];
foreach ($links as $link) {
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
index 7c984020243..7a8bb345d23 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
@@ -7,7 +7,7 @@
namespace Magento\Downloadable\Test\Block\Customer\Products;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class ListProducts
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 e2fe6770baf..e997a236705 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
@@ -7,7 +7,7 @@ namespace Magento\Downloadable\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractAssertForm;
/**
@@ -47,13 +47,13 @@ class AssertDownloadableLinksData extends AbstractAssertForm
*
* @param CatalogProductView $catalogProductView
* @param DownloadableProductInjectable $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
DownloadableProductInjectable $product,
- Browser $browser
+ BrowserInterface $browser
) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
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 1c216b23256..03238aee916 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
@@ -7,7 +7,7 @@ namespace Magento\Downloadable\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractAssertForm;
/**
@@ -45,13 +45,13 @@ class AssertDownloadableSamplesData extends AbstractAssertForm
*
* @param CatalogProductView $productView
* @param DownloadableProductInjectable $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
CatalogProductView $productView,
DownloadableProductInjectable $product,
- Browser $browser
+ BrowserInterface $browser
) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
index ba1b6510f68..21dc7fce14e 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
@@ -5,8 +5,8 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Block\Form as ParentForm;
-use Mtf\Client\Element;
use Mtf\Fixture\FixtureInterface;
/**
@@ -26,10 +26,10 @@ class Form extends ParentForm
* Fill backend GiftMessage item form.
*
* @param FixtureInterface $fixture
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fill(FixtureInterface $fixture, Element $element = null)
+ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
{
parent::fill($fixture, $element);
$this->_rootElement->find($this->okButton)->click();
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
index 381c2b2315d..d903121c10f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
@@ -6,7 +6,7 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
use Magento\GiftMessage\Test\Block\Adminhtml\Order\Create\Items\ItemProduct;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\InjectableFixture;
/**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
index 93ffe7cfd8f..3c8f3bff0a2 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
@@ -5,9 +5,8 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create\Items;
+use Mtf\Client\Locator;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
/**
* Item product block on backend create order page.
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
index 3d9ce754826..b08b7af6a27 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
@@ -6,7 +6,7 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View;
use Magento\GiftMessage\Test\Block\Adminhtml\Order\View\Items\ItemProduct;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\InjectableFixture;
/**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
index f69e3d2fcfe..7f1de882dce 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
@@ -5,9 +5,8 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View\Items;
+use Mtf\Client\Locator;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
/**
* Class ItemProduct
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
index e6c487c43c2..7d9b7873825 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
@@ -7,7 +7,7 @@ namespace Magento\GiftMessage\Test\Block\Message;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Inline
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
index 8eb82e24f8e..f37ac809d6b 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
@@ -6,7 +6,7 @@
namespace Magento\GiftMessage\Test\Block\Message\Order\Items;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Gift message block for order's items on order view page.
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 88a833c9bd4..707101b4bfd 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
@@ -6,8 +6,8 @@
namespace Magento\GoogleShopping\Test\Block\Adminhtml\Types\Edit;
use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class GoogleShoppingForm
@@ -33,10 +33,10 @@ class GoogleShoppingForm extends Form
* Fill specified form data
*
* @param array $fields
- * @param Element $element
+ * @param SimpleElement $element
* @return void
*/
- protected function _fill(array $fields, Element $element = null)
+ protected function _fill(array $fields, SimpleElement $element = null)
{
$context = ($element === null) ? $this->_rootElement : $element;
foreach ($fields as $field) {
@@ -86,7 +86,7 @@ class GoogleShoppingForm extends Form
*/
protected function getOptions()
{
- $elements = $this->_rootElement->find($this->attributeOptions, Locator::SELECTOR_XPATH)->getElements();
+ $elements = $this->_rootElement->getElements($this->attributeOptions, Locator::SELECTOR_XPATH);
$options = [];
foreach ($elements as $key => $element) {
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
index 1a81d130a35..27c46150bbf 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
@@ -6,8 +6,9 @@
namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped;
use Magento\Backend\Test\Block\Widget\Tab;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class AssociatedProducts
@@ -73,13 +74,13 @@ class AssociatedProducts extends Tab
* Fill data to fields on tab
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
if (isset($fields['associated'])) {
- $options = $this->_rootElement->find($this->deleteButton)->getElements();
+ $options = $this->_rootElement->getElements($this->deleteButton);
if (count($options)) {
foreach ($options as $option) {
$option->click();
@@ -100,10 +101,10 @@ class AssociatedProducts extends Tab
* Get data to fields on group tab
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
$newFields = [];
if (isset($fields['associated'])) {
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index 7eda5b3319f..cc6eaef22f5 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -6,8 +6,7 @@
namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped\AssociatedProducts;
use Mtf\Block\Form;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class ListAssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
index 5d08e9cdd71..03353fb0c1a 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
@@ -6,7 +6,6 @@
namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped\AssociatedProducts\Search;
use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
-use Mtf\Client\Element;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
index aa719f39917..4bc56774a07 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\GroupedProduct\Test\Fixture\GroupedProduct;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
use Mtf\Fixture\InjectableFixture;
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart/CartItem.php
index d4bd1a6dccf..4413298a1e0 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart/CartItem.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart/CartItem.php
@@ -115,7 +115,6 @@ class CartItem extends AbstractCartItem
{
foreach ($this->config['associated_cart_items'] as $cartItem) {
/** @var CheckoutCartItem $cartItem */
- $cartItem->reinitRootElement();
$cartItem->removeItem();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
index f5bc95fafb2..041777dba5d 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Constraint\AssertPriceOnProductPageInterface;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -37,7 +37,7 @@ abstract class AbstractAssertPriceOnGroupedProductPage extends AbstractConstrain
* @param GroupedProductInjectable $product
* @param CatalogProductView $catalogProductView
* @param AssertPriceOnProductPageInterface $object
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param string $typePrice [optional]
* @return bool|string
*/
@@ -45,7 +45,7 @@ abstract class AbstractAssertPriceOnGroupedProductPage extends AbstractConstrain
GroupedProductInjectable $product,
CatalogProductView $catalogProductView,
AssertPriceOnProductPageInterface $object,
- Browser $browser,
+ BrowserInterface $browser,
$typePrice = ''
) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
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 3b487c34e10..c6630befe7f 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
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
/**
* Class AssertGroupedPriceOnGroupedProductPage
@@ -40,14 +40,14 @@ class AssertGroupedPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupe
* @param CatalogProductView $catalogProductView
* @param GroupedProductInjectable $product
* @param AssertProductGroupedPriceOnProductPage $groupedPrice
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
GroupedProductInjectable $product,
AssertProductGroupedPriceOnProductPage $groupedPrice,
- Browser $browser
+ BrowserInterface $browser
) {
$this->processAssertPrice($product, $catalogProductView, $groupedPrice, $browser);
}
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 a1002454955..d167d841cec 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
@@ -7,7 +7,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractAssertForm;
/**
@@ -25,13 +25,13 @@ class AssertGroupedProductsDefaultQty extends AbstractAssertForm
*
* @param CatalogProductView $groupedProductView
* @param GroupedProductInjectable $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
CatalogProductView $groupedProductView,
GroupedProductInjectable $product,
- Browser $browser
+ BrowserInterface $browser
) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
$associatedProducts = $product->getAssociated();
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 d0d23336d90..6ad65ce45c9 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
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
/**
* Class AssertSpecialPriceOnGroupedProductPage
@@ -39,14 +39,14 @@ class AssertSpecialPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupe
* @param CatalogProductView $catalogProductView
* @param GroupedProductInjectable $product
* @param AssertProductSpecialPriceOnProductPage $specialPrice
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
GroupedProductInjectable $product,
AssertProductSpecialPriceOnProductPage $specialPrice,
- Browser $browser
+ BrowserInterface $browser
) {
$this->processAssertPrice($product, $catalogProductView, $specialPrice, $browser);
}
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 754ddefe062..34227d6bb34 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
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
/**
* Class AssertTierPriceOnGroupedProductPage
@@ -40,14 +40,14 @@ class AssertTierPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupedPr
* @param CatalogProductView $catalogProductView
* @param GroupedProductInjectable $product
* @param AssertProductTierPriceOnProductPage $tierPrice
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
GroupedProductInjectable $product,
AssertProductTierPriceOnProductPage $tierPrice,
- Browser $browser
+ BrowserInterface $browser
) {
$this->processAssertPrice($product, $catalogProductView, $tierPrice, $browser, 'Tier');
}
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
index 7c1ef5d2132..08082461300 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Block\Adminhtml\Integration;
use Magento\Backend\Test\Block\Widget\Grid;
use Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid\ResourcesPopup;
use Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid\TokensPopup;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class IntegrationGrid
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
index 22f2c6759f7..b224fa7400a 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
@@ -6,7 +6,7 @@
namespace Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class DeleteDialog
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
index c9a12c6efa6..38b550424f7 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
@@ -5,7 +5,7 @@
namespace Magento\Newsletter\Test\Block\Adminhtml\Template;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
index b54f2bfdc8b..e16a924b27c 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
@@ -6,8 +6,7 @@
namespace Magento\Newsletter\Test\Block\Adminhtml\Template;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Newsletter template preview.
@@ -44,6 +43,7 @@ class Preview extends Block
}
);
$this->browser->switchToFrame(new Locator($this->iFrame));
+
return $this->_rootElement->getText();
}
}
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 358d9577e58..672fd95eca5 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
@@ -7,7 +7,7 @@ namespace Magento\Newsletter\Test\Constraint;
use Magento\Newsletter\Test\Fixture\Template;
use Magento\Newsletter\Test\Page\Adminhtml\TemplatePreview;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -23,12 +23,12 @@ class AssertNewsletterPreview extends AbstractConstraint
/**
* Assert that newsletter preview opened in new window and template content correct
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param TemplatePreview $templatePreview
* @param Template $newsletter
* @return void
*/
- public function processAssert(Browser $browser, TemplatePreview $templatePreview, Template $newsletter)
+ public function processAssert(BrowserInterfaceInterface $browser, TemplatePreview $templatePreview, Template $newsletter)
{
$browser->selectWindow();
$content = $templatePreview->getContent()->getPageContent();
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
index c5bd1a26c30..cb79956071e 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
@@ -5,7 +5,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Customer;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\ObjectManager;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
index 396c165cdeb..1c46add92e1 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
@@ -5,8 +5,8 @@
namespace Magento\Reports\Test\Block\Adminhtml\Customer\Totals;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Grid
@@ -61,7 +61,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
* @param array $filter
* @param bool $isSearchable
* @param bool $isStrict
- * @return Element
+ * @return SimpleElement
*/
protected function getRow(array $filter, $isSearchable = true, $isStrict = true)
{
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
index 921d370a7d7..3b712dea80e 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
@@ -6,7 +6,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Refresh\Statistics;
use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
index ffadaf4616c..1afe99ad70a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
@@ -7,7 +7,7 @@ namespace Magento\Reports\Test\Block\Adminhtml\Review\Customer;
use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
index 029ccae33c5..2387866ad4a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
@@ -6,7 +6,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Review\Products;
use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
index c73325a9094..aefdfd58de6 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
@@ -6,7 +6,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class ProductGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
index 5bafdea1d0a..feb84e74997 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
@@ -6,7 +6,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class FilterGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
index 98cb448b404..330caecb1b0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -6,7 +6,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Shopcart\Product;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Grid
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 a7acfcfb81d..b4c40b42d13 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
@@ -5,11 +5,11 @@
namespace Magento\Reports\Test\TestCase;
-use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Client\Browser;
-use Mtf\Fixture\FixtureFactory;
use Mtf\TestCase\Injectable;
+use Mtf\Fixture\FixtureFactory;
+use Mtf\Client\BrowserInterface;
+use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Catalog\Test\Page\Product\CatalogProductView;
/**
* Test Flow:
@@ -42,7 +42,7 @@ class AbandonedCartsReportEntityTest extends Injectable
/**
* Browser interface.
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -56,13 +56,13 @@ class AbandonedCartsReportEntityTest extends Injectable
/**
* Inject pages.
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param FixtureFactory $fixtureFactory
* @param CatalogProductView $catalogProductView
* @return void
*/
public function __inject(
- Browser $browser,
+ BrowserInterface $browser,
FixtureFactory $fixtureFactory,
CatalogProductView $catalogProductView
) {
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
index 435c74a48f3..49e2ac22f18 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
@@ -14,7 +14,7 @@ use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAccountLogout;
use Magento\Reports\Test\Page\Adminhtml\ProductReportReview;
use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Fixture\FixtureFactory;
use Mtf\TestCase\Injectable;
@@ -130,7 +130,7 @@ class CustomerReviewReportEntityTest extends Injectable
* @param CustomerInjectable $customer
* @param $customerLogin
* @param CatalogProductSimple $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return array
*
* @SuppressWarnings(PHPMD.ConstructorWithNameAsEnclosingClass)
@@ -139,7 +139,7 @@ class CustomerReviewReportEntityTest extends Injectable
ReviewInjectable $review,
CustomerInjectable $customer,
CatalogProductSimple $product,
- Browser $browser,
+ BrowserInterface $browser,
$customerLogin
) {
// Preconditions
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
index e4f96cb9aec..582a6a56c8a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
@@ -11,7 +11,7 @@ use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAccountLogout;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\TestCase\Injectable;
/**
@@ -103,14 +103,14 @@ class ProductsInCartReportEntity extends Injectable
* @param CustomerInjectable $customer
* @param CatalogProductSimple $product
* @param string $isGuest
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function test(
CustomerInjectable $customer,
CatalogProductSimple $product,
$isGuest,
- Browser $browser
+ BrowserInterface $browser
) {
// Preconditions
$product->persist();
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 d9e2df96f8e..e8c0a729a0e 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
@@ -5,7 +5,7 @@
namespace Magento\Reports\Test\TestCase;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\TestCase\Injectable;
use Mtf\Fixture\FixtureFactory;
use Magento\Reports\Test\Page\Adminhtml\ProductReportView;
@@ -49,7 +49,7 @@ class ViewedProductsReportEntityTest extends Injectable
/**
* Browser interface
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -70,13 +70,13 @@ class ViewedProductsReportEntityTest extends Injectable
*
* @param ProductReportView $productReportView
* @param FixtureFactory $fixtureFactory
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function __inject(
ProductReportView $productReportView,
FixtureFactory $fixtureFactory,
- Browser $browser
+ BrowserInterface $browser
) {
$this->productReportView = $productReportView;
$this->fixtureFactory = $fixtureFactory;
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
index 6585317e10d..863ef47a040 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
@@ -5,14 +5,14 @@
namespace Magento\Review\Test\Block\Adminhtml\Edit;
-use Mtf\Client\Driver\Selenium\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class RatingElement
* Rating typified element
*/
-class RatingElement extends Element
+class RatingElement extends SimpleElement
{
/**
* Rating selector
@@ -52,10 +52,10 @@ class RatingElement extends Element
/**
* Get rating vote
*
- * @param Element $rating
+ * @param SimpleElement $rating
* @return int
*/
- protected function getRatingVote(Element $rating)
+ protected function getRatingVote(SimpleElement $rating)
{
$ratingVote = 5;
$ratingVoteElement = $rating->find(sprintf($this->checkedRating, $ratingVote));
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
index 7250e443471..a23d0a881fd 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
@@ -6,7 +6,8 @@
namespace Magento\Review\Test\Block\Adminhtml;
use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element\Locator;
+use Magento\Review\Test\Fixture\ReviewInjectable;
+use Mtf\Client\Locator;
/**
* Class Edit
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
index b4b2377eb45..06418c860f0 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
@@ -5,12 +5,12 @@
namespace Magento\Review\Test\Block;
+use Mtf\Client\Locator;
+use Mtf\Fixture\FixtureInterface;
+use Mtf\Client\Element\SimpleElement;
use Magento\Review\Test\Fixture\Rating;
use Magento\Review\Test\Fixture\ReviewInjectable;
use Mtf\Block\Form as AbstractForm;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
-use Mtf\Fixture\FixtureInterface;
/**
* Class Form
@@ -59,7 +59,7 @@ class Form extends AbstractForm
/**
* Get legend
*
- * @return Element
+ * @return SimpleElement
*/
public function getLegend()
{
@@ -81,7 +81,7 @@ class Form extends AbstractForm
* Get single product rating
*
* @param Rating $rating
- * @return Element
+ * @return SimpleElement
*/
protected function getRating(Rating $rating)
{
@@ -92,10 +92,10 @@ class Form extends AbstractForm
* Fill the review form
*
* @param FixtureInterface $review
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fill(FixtureInterface $review, Element $element = null)
+ public function fill(FixtureInterface $review, SimpleElement $element = null)
{
if ($review instanceof ReviewInjectable) {
$this->fillRatings($review);
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
index 8119fbc553e..1b9d8e9ea5e 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
@@ -31,7 +31,7 @@ class Summary extends Block
/**
* Get add review link
*
- * @return \Mtf\Client\Element
+ * @return \Mtf\Client\ElementInterface
*/
public function getAddReviewLink()
{
@@ -41,7 +41,7 @@ class Summary extends Block
/**
* Get view review link
*
- * @return \Mtf\Client\Element
+ * @return \Mtf\Client\ElementInterface
*/
public function getViewReviewLink()
{
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 66b26ef9c4d..83de8b98aec 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
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Review\Test\Fixture\Rating;
use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -26,7 +26,7 @@ class AssertProductRatingInProductPage extends AbstractConstraint
* Assert that product rating is displayed on product review(frontend)
*
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductSimple $product
* @param ReviewInjectable|null $review [optional]
* @param Rating|null $productRating [optional]
@@ -34,7 +34,7 @@ class AssertProductRatingInProductPage extends AbstractConstraint
*/
public function processAssert(
CatalogProductView $catalogProductView,
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductSimple $product,
ReviewInjectable $review = null,
Rating $productRating = null
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 43c3cf191fc..40967102fd4 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
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Review\Test\Fixture\Rating;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -26,14 +26,14 @@ class AssertProductRatingNotInProductPage extends AbstractConstraint
* @param CatalogProductView $catalogProductView
* @param CatalogProductSimple $product
* @param Rating $productRating
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
CatalogProductSimple $product,
Rating $productRating,
- Browser $browser
+ BrowserInterface $browser
) {
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
$catalogProductView->getReviewSummary()->getAddReviewLink()->click();
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 e5a3ae3b556..142374c6035 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
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -26,13 +26,13 @@ class AssertProductReviewNotOnProductPage extends AbstractConstraint
*
* @param CatalogProductView $catalogProductView
* @param ReviewInjectable $reviewInitial
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
CatalogProductView $catalogProductView,
ReviewInjectable $reviewInitial,
- Browser $browser
+ BrowserInterface $browser
) {
/** @var CatalogProductSimple $product */
$product = $reviewInitial->getDataFieldConfig('entity_id')['source']->getEntity();
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 7ff7a616b38..32b18bfb0d3 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
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\AdminCache;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureInterface;
@@ -28,7 +28,7 @@ class AssertProductReviewOnProductPage extends AbstractConstraint
* @param CatalogProductView $catalogProductView
* @param ReviewInjectable $review
* @param FixtureInterface $product
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param AdminCache $cachePage
* @return void
*/
@@ -36,7 +36,7 @@ class AssertProductReviewOnProductPage extends AbstractConstraint
CatalogProductView $catalogProductView,
ReviewInjectable $review,
FixtureInterface $product,
- Browser $browser,
+ BrowserInterface $browser,
AdminCache $cachePage
) {
$errors = [];
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
index 12ec277c3c2..a165ef3afb3 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Review\Test\Fixture\ReviewInjectable;
use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\TestCase\Injectable;
/**
@@ -84,10 +84,10 @@ class CreateProductReviewFrontendEntityTest extends Injectable
* Run create frontend product rating test
*
* @param ReviewInjectable $review
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return array
*/
- public function test(ReviewInjectable $review, Browser $browser)
+ public function test(ReviewInjectable $review, BrowserInterface $browser)
{
// Prepare for tear down
$this->review = $review;
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
index a9d4b383b48..7e919271975 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
@@ -16,7 +16,7 @@ use Magento\Review\Test\Fixture\ReviewInjectable;
use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\TestCase\Injectable;
/**
@@ -77,7 +77,7 @@ class ManageProductReviewFromCustomerPageTest extends Injectable
/**
* Browser
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -136,7 +136,7 @@ class ManageProductReviewFromCustomerPageTest extends Injectable
* @param CmsIndex $cmsIndex
* @param CustomerAccountLogin $customerAccountLogin
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param RatingIndex $ratingIndex
* @param RatingEdit $ratingEdit
* @param ReviewEdit $reviewEdit
@@ -148,7 +148,7 @@ class ManageProductReviewFromCustomerPageTest extends Injectable
CmsIndex $cmsIndex,
CustomerAccountLogin $customerAccountLogin,
CatalogProductView $catalogProductView,
- Browser $browser,
+ BrowserInterface $browser,
RatingIndex $ratingIndex,
RatingEdit $ratingEdit,
ReviewEdit $reviewEdit
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 355bdef0c47..f8611a4aa54 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
@@ -80,7 +80,6 @@ abstract class AbstractForm extends Form
return $element->isVisible() == false ? true : null;
}
);
- $this->reinitRootElement();
$this->_rootElement->find($this->send)->click();
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
index 01a9b4193dd..b5c9afd578f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
@@ -76,7 +76,7 @@ class AbstractItems extends Block
*/
public function getData()
{
- $items = $this->_rootElement->find($this->rowItem)->getElements();
+ $items = $this->_rootElement->getElements($this->rowItem);
$data = [];
foreach ($items as $item) {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
index db1389a9782..974007ed963 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Actions
@@ -170,7 +170,7 @@ class Actions extends Block
public function cancel()
{
$this->_rootElement->find($this->cancel)->click();
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
index 0c8c21a0b15..e8aa16e7999 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Fixture\FixtureInterface;
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
index 4dc59b14faa..d00ba7fb8e1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -28,7 +28,6 @@ class Address extends Form
*/
public function getExistingAddresses()
{
- $this->reinitRootElement();
return explode("\n", $this->_rootElement->find($this->existingAddressSelector)->getText());
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
index 058fde4a1e2..99889f11edb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
@@ -12,7 +12,7 @@ use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\R
use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\RecentlyViewedProducts;
use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\ShoppingCartItems;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class CustomerActivities
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
index d7d83760d20..14db7399d36 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Sidebar block.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
index 83b59a91c1e..688bb3acc43 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar;
use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class RecentlyViewedProducts
@@ -29,8 +29,7 @@ class RecentlyViewedProducts extends Sidebar
public function getProducts()
{
$products = [];
- $productNames = $this->_rootElement->find($this->recentlyViewedProducts, Locator::SELECTOR_XPATH)
- ->getElements();
+ $productNames = $this->_rootElement->getElements($this->recentlyViewedProducts, Locator::SELECTOR_XPATH);
foreach ($productNames as $productName) {
$products[] = $productName->getText();
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
index 2d889637127..a4b3464672e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
@@ -7,7 +7,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
use Magento\Backend\Test\Block\Template;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Items
@@ -85,7 +85,7 @@ class Items extends Block
{
$this->getTemplateBlock()->waitLoader();
$this->_rootElement->click();
- $products = $this->_rootElement->find($this->productNames, Locator::SELECTOR_XPATH)->getElements();
+ $products = $this->_rootElement->getElements($this->productNames, Locator::SELECTOR_XPATH);
$pageData = [];
foreach ($products as $product) {
$pageData[] = $this->getItemProductByName($product->getText())->getCheckoutData($fields);
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
index 744fb440f50..144cd59d008 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Items;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class ItemProduct
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
index faae41bd8ea..3e20ee2c511 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class ShippingAddress
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
index bed696e4896..efa4e1f6c40 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Method
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
index b071383601c..a5d852c5016 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
use Magento\Store\Test\Fixture\Store as StoreFixture;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
index d3bd69d03a0..5a1c8b5224a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
index ae9f6ab845d..4228e1293c1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
index b15ef482eee..9cdceee8c28 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
@@ -7,7 +7,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form;
use Magento\Sales\Test\Block\Adminhtml\Order\AbstractItemsNewBlock;
use Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form\Items\Product;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
index 32f2d54254c..8dfe350a401 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Totals
@@ -44,7 +44,6 @@ class Totals extends Block
return $element->isVisible() == false ? true : null;
}
);
- $this->reinitRootElement();
$this->_rootElement->find($this->submit)->click();
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/View/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/View/Items.php
index 60ccef39c5f..74e89c16561 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/View/Items.php
@@ -20,7 +20,7 @@ class Items extends AbstractItems
*/
public function getData()
{
- $items = $this->_rootElement->find($this->rowItem)->getElements();
+ $items = $this->_rootElement->getElements($this->rowItem);
$data = [];
foreach ($items as $item) {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index cff130c94a3..4239579837f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
index e8725e61a85..3cff8925271 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\View;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Block for information about customer on order page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
index d70210c7c11..0dc8b98c44b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\View;
use Magento\Catalog\Test\Fixture\Product;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php
index e5d47c46f29..b4d1bd10f25 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php
@@ -57,7 +57,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
public function getIds()
{
$result = [];
- $creditMemoIds = $this->_rootElement->find($this->editLink)->getElements();
+ $creditMemoIds = $this->_rootElement->getElements($this->editLink);
foreach ($creditMemoIds as $creditMemoId) {
$result[] = trim($creditMemoId->getText());
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
index a5459ff0ce0..6e6e17c3d97 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Info
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
index 7ee52474297..388510706b2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
@@ -54,7 +54,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
public function getIds()
{
$result = [];
- $invoiceIds = $this->_rootElement->find($this->invoiceId)->getElements();
+ $invoiceIds = $this->_rootElement->getElements($this->invoiceId);
foreach ($invoiceIds as $invoiceId) {
$result[] = trim($invoiceId->getText());
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php
index 12bcde191e6..fc5a9c6366a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php
@@ -50,7 +50,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
public function getIds()
{
$result = [];
- $shipmentIds = $this->_rootElement->find($this->shipmentId)->getElements();
+ $shipmentIds = $this->_rootElement->getElements($this->shipmentId);
foreach ($shipmentIds as $shipmentId) {
$result[] = trim($shipmentId->getText());
}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
index 76ffd9ad785..af39f2b64cc 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Order;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class History
@@ -72,7 +72,7 @@ class History extends Block
* Get item order block
*
* @param string $id
- * @return Element
+ * @return SimpleElement
*/
protected function searchOrderById($id)
{
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
index 2f578aac400..900b2249590 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Order;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Info block on order's view page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
index 691b21979b8..02a4e2425d1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Order;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Items block on order's view page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
index cb7a16398d8..45f13dacfcf 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Order;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class View
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
index d1e49fb25fa..899dc507f6a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Order\View;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Order view block.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
index d47c284c7fb..9136e846e5e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
@@ -5,7 +5,7 @@
namespace Magento\Sales\Test\Page;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Factory\Factory;
use Mtf\Page\Page;
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 bb676a6c7fd..b53d71f4edf 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
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\SalesGuestView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\TestStep\TestStepInterface;
/**
@@ -24,16 +24,16 @@ class PrintOrderOnFrontendStep implements TestStepInterface
/**
* Browser.
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
/**
* @constructor
* @param SalesGuestView $salesGuestView
- * @param Browser $browser
+ * @param BrowserInterface $browser
*/
- public function __construct(SalesGuestView $salesGuestView, Browser $browser)
+ public function __construct(SalesGuestView $salesGuestView, BrowserInterface $browser)
{
$this->salesGuestView = $salesGuestView;
$this->browser = $browser;
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
index 5aaa2682c37..6733e1699ee 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
@@ -7,7 +7,7 @@ namespace Magento\Shipping\Test\Block\Adminhtml\Order;
use Magento\Shipping\Test\Block\Adminhtml\Order\Tracking\Item;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Tracking
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
index 049b96d3666..4f5bff3dae7 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
@@ -5,7 +5,7 @@
namespace Magento\Shipping\Test\Block\Order;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Info block on order's view page.
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
index ac87a3c3b66..2a63e5b2341 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
@@ -7,7 +7,7 @@ namespace Magento\Shipping\Test\Block\Order;
use Magento\Shipping\Test\Block\Order\Shipment\Items;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Shipment
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
index 0cb9bd130ed..325074d5586 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
@@ -6,7 +6,7 @@
namespace Magento\Sitemap\Test\Block\Adminhtml;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class SitemapGrid
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php b/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
index 4f33449b391..64d64669cfa 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Block;
use Magento\Store\Test\Fixture\Store;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Switcher
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
index 52611d0de6f..11b2c6b6d4f 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
@@ -5,11 +5,11 @@
namespace Magento\Tax\Test\Block\Adminhtml\Rule\Edit;
+use Mtf\Client\Locator;
+use Mtf\Fixture\FixtureInterface;
use Magento\Tax\Test\Fixture\TaxRule;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Block\Form as FormInterface;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
-use Mtf\Fixture\FixtureInterface;
/**
* Form for tax rule creation.
@@ -111,12 +111,12 @@ class Form extends FormInterface
* Fill the root form.
*
* @param FixtureInterface $fixture
- * @param Element $element
+ * @param SimpleElement $element
* @return $this|void
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function fill(FixtureInterface $fixture, Element $element = null)
+ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
{
$this->openAdditionalSettings();
$this->_rootElement->click();
@@ -161,14 +161,12 @@ class Form extends FormInterface
$taxRateDefaultMultiSelect = $this->taxRateDefaultMultiSelect;
$this->browser->waitUntil(
function () use ($rootForm, $taxRateDefaultMultiSelect) {
- $rootForm->reinitRootElement();
$element = $rootForm->browser->find($taxRateDefaultMultiSelect);
return $element->isVisible() ? null : true;
}
);
$this->browser->waitUntil(
function () use ($rootForm, $taxRateMultiSelectList) {
- $rootForm->reinitRootElement();
$element = $rootForm->browser->find($taxRateMultiSelectList);
return $element->isVisible() ? true : null;
}
@@ -205,10 +203,10 @@ class Form extends FormInterface
* Method to add new tax classes.
*
* @param array $taxClasses
- * @param Element $element
+ * @param SimpleElement $element
* @return void
*/
- protected function addNewTaxClass(array $taxClasses, Element $element)
+ protected function addNewTaxClass(array $taxClasses, SimpleElement $element)
{
foreach ($taxClasses as $taxClass) {
$option = $element->find(sprintf($this->optionMaskElement, $taxClass), Locator::SELECTOR_XPATH);
@@ -231,7 +229,7 @@ class Form extends FormInterface
/**
* Waiting until option in list is visible.
*
- * @param Element $element
+ * @param SimpleElement $element
* @param string $value
* @return void
*/
@@ -277,18 +275,19 @@ class Form extends FormInterface
return $element->isVisible() ? true : null;
}
);
- /** @var \Mtf\Client\Driver\Selenium\Element\MultiselectlistElement $taxRates */
+ /** @var \Mtf\Client\Element\MultiselectlistElement $taxRates */
$taxRates = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
+
return $taxRates->getAllValues();
}
/**
* Click 'Add New' button.
*
- * @param Element $element
+ * @param SimpleElement $element
* @return void
*/
- protected function clickAddNewButton(Element $element)
+ protected function clickAddNewButton(SimpleElement $element)
{
$addNewButton = $this->addNewButton;
$element->waitUntil(
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php
index 3786d6dc57a..696adc3777b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Grid.php
@@ -6,7 +6,6 @@
namespace Magento\Tax\Test\Block\Adminhtml\Rule;
use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
-use Mtf\Client\Element\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
index 170a2c34669..a101ed634dc 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
@@ -13,7 +13,7 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAccountLogout;
use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\FixtureFactory;
@@ -88,7 +88,7 @@ abstract class AssertTaxRuleApplying extends AbstractConstraint
* @param CheckoutCart $checkoutCart
* @param AddressInjectable $address
* @param array $shipping
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param TaxRule $initialTaxRule
* @return void
*
@@ -104,7 +104,7 @@ abstract class AssertTaxRuleApplying extends AbstractConstraint
CheckoutCart $checkoutCart,
AddressInjectable $address,
array $shipping,
- Browser $browser,
+ BrowserInterface $browser,
TaxRule $initialTaxRule = null
) {
$this->initialTaxRule = $initialTaxRule;
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 fc56ae562a3..30b790cc149 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
@@ -6,9 +6,9 @@
namespace Magento\Theme\Test\Block\Html;
-use Magento\Store\Test\Fixture\Store;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Magento\Store\Test\Fixture\Store;
/**
* Footer block
@@ -55,7 +55,7 @@ class Footer extends Block
* Click on link by name
*
* @param string $linkName
- * @return \Mtf\Client\Element
+ * @return void
* @throws \Exception
*/
public function clickLink($linkName)
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
index 0c15938cf24..10d3935eae4 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
@@ -7,7 +7,7 @@
namespace Magento\Theme\Test\Block\Html;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Topmenu
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
index 94177d4a9d4..8c33704ac5c 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
@@ -7,7 +7,7 @@
namespace Magento\Theme\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Page Top Links block.
@@ -78,7 +78,10 @@ class Links extends Block
*/
public function getLinkUrl($linkTitle)
{
- return trim($this->_rootElement->find(sprintf($this->link, $linkTitle), Locator::SELECTOR_XPATH)->getUrl());
+ $link = $this->_rootElement->find(sprintf($this->link, $linkTitle), Locator::SELECTOR_XPATH)
+ ->getAttribute('href');
+
+ return trim($link);
}
/**
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 a5b6b384f4a..e92678021b6 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
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Category;
use Magento\Catalog\Test\Fixture\CatalogCategory;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Tree
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
index 324170dfc11..2a05d905b25 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
@@ -6,6 +6,7 @@
namespace Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Edit;
use Magento\Backend\Test\Block\Widget\Form;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Element;
use Mtf\Fixture\FixtureInterface;
@@ -19,13 +20,13 @@ class UrlRewriteForm extends Form
* Fill the root form
*
* @param FixtureInterface $fixture
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @param array $replace [optional]
* @return $this
*/
public function fill(
FixtureInterface $fixture,
- Element $element = null,
+ SimpleElement $element = null,
array $replace = []
) {
$data = $fixture->getData();
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
index 37fc083a8ff..bd5f814a766 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
@@ -7,7 +7,7 @@
namespace Magento\UrlRewrite\Test\Block\Adminhtml;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Selector
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 69b9f49957a..b186be3c9b1 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
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -28,13 +28,13 @@ class AssertPageByUrlRewriteIsNotFound extends AbstractConstraint
/**
* Checking the server response 404 page on frontend
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogProductView $catalogProductView
* @param UrlRewrite $productRedirect
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
CatalogProductView $catalogProductView,
UrlRewrite $productRedirect
) {
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 6c728817a9e..a35b2663c74 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
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogCategory;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -25,13 +25,13 @@ class AssertUrlRewriteCategoryRedirect extends AbstractConstraint
*
* @param UrlRewrite $urlRewrite
* @param CatalogCategory $category
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @return void
*/
public function processAssert(
UrlRewrite $urlRewrite,
CatalogCategory $category,
- Browser $browser
+ BrowserInterface $browser
) {
$browser->open($_ENV['app_frontend_url'] . $urlRewrite->getRequestPath());
$url = $urlRewrite->getRedirectType() == 'No'
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 77667006006..409996f29d4 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
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -24,11 +24,11 @@ class AssertUrlRewriteCustomRedirect extends AbstractConstraint
* Assert check URL rewrite custom redirect
*
* @param UrlRewrite $urlRewrite
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CmsIndex $cmsIndex
* @return void
*/
- public function processAssert(UrlRewrite $urlRewrite, Browser $browser, CmsIndex $cmsIndex)
+ public function processAssert(UrlRewrite $urlRewrite, BrowserInterface $browser, CmsIndex $cmsIndex)
{
$browser->open($_ENV['app_frontend_url'] . $urlRewrite->getRequestPath());
$entity = $urlRewrite->getDataFieldConfig('target_path')['source']->getEntity();
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 6f5fdaf774d..75933802c05 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
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -25,14 +25,14 @@ class AssertUrlRewriteCustomSearchRedirect extends AbstractConstraint
*
* @param UrlRewrite $initialRewrite
* @param UrlRewrite $urlRewrite
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CatalogCategoryView $categoryView
* @return void
*/
public function processAssert(
UrlRewrite $initialRewrite,
UrlRewrite $urlRewrite,
- Browser $browser,
+ BrowserInterface $browser,
CatalogCategoryView $categoryView
) {
$urlRequestPath = $urlRewrite->hasData('request_path')
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 51ca53f93fa..cceda044f18 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
@@ -7,7 +7,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Mtf\Fixture\InjectableFixture;
@@ -26,14 +26,14 @@ class AssertUrlRewriteProductRedirect extends AbstractConstraint
*
* @param UrlRewrite $urlRewrite
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param InjectableFixture $product
* @return void
*/
public function processAssert(
UrlRewrite $urlRewrite,
CatalogProductView $catalogProductView,
- Browser $browser,
+ BrowserInterface $browser,
InjectableFixture $product = null
) {
$browser->open($_ENV['app_frontend_url'] . $urlRewrite->getRequestPath());
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 a8189399e2a..14bf49ad4b9 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
@@ -6,7 +6,7 @@
namespace Magento\UrlRewrite\Test\Constraint;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
/**
@@ -23,11 +23,11 @@ class AssertUrlRewriteSuccessOutsideRedirect extends AbstractConstraint
* Assert that outside redirect was success
*
* @param UrlRewrite $urlRewrite
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param UrlRewrite|null $initialRewrite [optional]
* @return void
*/
- public function processAssert(UrlRewrite $urlRewrite, Browser $browser, UrlRewrite $initialRewrite = null)
+ public function processAssert(UrlRewrite $urlRewrite, BrowserInterface $browser, UrlRewrite $initialRewrite = null)
{
$urlRequestPath = $urlRewrite->hasData('request_path')
? $urlRewrite->getRequestPath()
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
index 5cbfc9c6e8c..8bba90dad82 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
@@ -6,7 +6,7 @@
namespace Magento\User\Test\Block\Adminhtml\Role\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Role
@@ -18,10 +18,10 @@ class Role extends Tab
* Fills username in user grid
*
* @param array $fields
- * @param Element $element
+ * @param SimpleElement $element
* @return void
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
$users = (is_array($fields['in_role_users']['value']))
? $fields['in_role_users']['value']
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
index 4cfc5687751..1ff00d65808 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Block\Adminhtml\User\Edit;
use Magento\Backend\Test\Block\Widget\FormTabs;
use Magento\User\Test\Block\Adminhtml\User\Edit\Tab\Roles;
use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/PageActions.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/PageActions.php
index 4fcbaa14b88..06a446a2363 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/PageActions.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/PageActions.php
@@ -28,6 +28,6 @@ class PageActions extends FormPageActions
public function forceSignIn()
{
$this->_rootElement->find($this->forceSignIn)->click();
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
index 4ef09d1a951..f14a6c4d75a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
@@ -5,9 +5,8 @@
namespace Magento\User\Test\Block\Adminhtml\User\Tab;
+use Mtf\Client\Element\SimpleElement;
use Magento\Backend\Test\Block\Widget\Tab;
-use Magento\User\Test\Block\Adminhtml\User\Tab\Role\Grid;
-use Mtf\Client\Element;
/**
* Class Role
@@ -19,10 +18,10 @@ class Role extends Tab
* Fill user options
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return void
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
$this->getRoleGrid()->searchAndSelect(['rolename' => $fields['role_id']['value']]);
}
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
index d947cfed1e5..30f0a81ab62 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
@@ -5,9 +5,9 @@
namespace Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab;
+use Mtf\Client\Element;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist\Grid;
-use Mtf\Client\Element;
/**
* Class Wishlist
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 c2374e20b52..a5e9feda999 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
@@ -5,8 +5,8 @@
namespace Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
+use Mtf\Client\Element\SimpleElement;
/**
* Class Grid
@@ -57,7 +57,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
protected function delete()
{
$this->_rootElement->find($this->rowItem . ' ' . $this->deleteLink)->click();
- $this->_rootElement->acceptAlert();
+ $this->browser->acceptAlert();
}
/**
@@ -90,7 +90,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
* @param array $filter
* @param bool $isSearchable [optional]
* @param bool $isStrict [optional]
- * @return Element
+ * @return SimpleElement
*/
protected function getRow(array $filter, $isSearchable = true, $isStrict = true)
{
@@ -118,7 +118,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
);
}
}
- $location = $location . implode(' and ', $rows) . ']';
- return $this->_rootElement->find($location, Locator::SELECTOR_XPATH);
+
+ return $this->_rootElement->find($location . implode(' and ', $rows) . ']', Locator::SELECTOR_XPATH);
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
index 3d5383c239e..98324f97b67 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
@@ -7,8 +7,7 @@ namespace Magento\Wishlist\Test\Block\Customer\Wishlist;
use Magento\Wishlist\Test\Block\Customer\Wishlist\Items\Product;
use Mtf\Block\Block;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
use Mtf\Fixture\FixtureInterface;
/**
@@ -55,7 +54,6 @@ class Items extends Block
{
while ($this->_rootElement->find($this->remove)->isVisible()) {
$this->_rootElement->find($this->remove)->click();
- $this->reinitRootElement();
}
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
index 044b55a6aac..bdff557c864 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
@@ -6,7 +6,7 @@
namespace Magento\Wishlist\Test\Block\Customer\Wishlist\Items;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Class Product
@@ -113,8 +113,8 @@ class Product extends Form
if ($viewDetails->isVisible()) {
$this->_rootElement->find($this->footer, Locator::SELECTOR_XPATH)->click();
$viewDetails->click();
- $labels = $this->_rootElement->find($this->optionLabel)->getElements();
- $values = $this->_rootElement->find($this->optionValue)->getElements();
+ $labels = $this->_rootElement->getElements($this->optionLabel);
+ $values = $this->_rootElement->getElements($this->optionValue);
$data = [];
foreach ($labels as $key => $label) {
if (!$label->isVisible()) {
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 8c83fe2fff1..ce6d1d7e8cb 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
@@ -14,7 +14,7 @@ use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAccountLogout;
use Magento\Wishlist\Test\Page\WishlistIndex;
use Magento\Wishlist\Test\Page\WishlistShare;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\TestCase\Injectable;
/**
@@ -143,14 +143,14 @@ class ShareWishlistEntityTest extends Injectable
/**
* Share wish list
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param CustomerInjectable $customer
* @param CatalogProductSimple $product
* @param array $sharingInfo
* @return void
*/
public function test(
- Browser $browser,
+ BrowserInterface $browser,
CustomerInjectable $customer,
CatalogProductSimple $product,
array $sharingInfo
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
index ccbbe7581ef..6899edd352e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
@@ -6,7 +6,7 @@
namespace Magento\Wishlist\Test\TestStep;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\TestStep\TestStepInterface;
/**
@@ -32,7 +32,7 @@ class AddProductsToWishlistStep implements TestStepInterface
/**
* Interface Browser
*
- * @var Browser
+ * @var BrowserInterface
*/
protected $browser;
@@ -46,13 +46,13 @@ class AddProductsToWishlistStep implements TestStepInterface
/**
* @constructor
* @param CatalogProductView $catalogProductView
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param array $products
* @param bool $configure [optional]
*/
public function __construct(
CatalogProductView $catalogProductView,
- Browser $browser,
+ BrowserInterface $browser,
array $products,
$configure = false
) {
--
GitLab
From add4457771c8381cb353221baa7ba6a79e714883 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 31 Dec 2014 04:02:45 -0800
Subject: [PATCH 023/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- increased DepthOfInheritance minimum level to 8
- excluded php4 rules
---
.../Magento/Test/Php/_files/phpmd/ruleset.xml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
index 3a79cfa4cce..4551fd874cc 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
@@ -27,11 +27,19 @@
<rule ref="rulesets/unusedcode.xml" />
<!-- Code design rules -->
- <rule ref="rulesets/design.xml" />
+ <rule ref="rulesets/design.xml/ExitExpression" />
+ <rule ref="rulesets/design.xml/EvalExpression" />
+ <rule ref="rulesets/design.xml/GotoStatement" />
+ <rule ref="rulesets/design.xml/NumberOfChildren" />
+ <rule ref="rulesets/design.xml/DepthOfInheritance">
+ <properties>
+ <property name="minimum" value="8" />
+ </properties>
+ </rule>
+ <rule ref="rulesets/design.xml/CouplingBetweenObjects" />
<!-- Naming Rules -->
<rule ref="rulesets/naming.xml/ShortMethodName" />
- <rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass" />
<rule ref="rulesets/naming.xml/ConstantNamingConventions" />
<rule ref="rulesets/naming.xml/BooleanGetMethodName" />
</ruleset>
--
GitLab
From c40a50a74b1c6cfafd59db79da1c42e88589f0c7 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Fri, 2 Jan 2015 13:03:59 +0200
Subject: [PATCH 024/120] MAGETWO-32079: Alternative WebDriver support
---
.../tests/app/Magento/Install/Test/Block/CreateAdmin.php | 2 +-
.../tests/app/Magento/Install/Test/Block/CustomizeStore.php | 2 +-
.../tests/app/Magento/Install/Test/Block/Database.php | 2 +-
.../functional/tests/app/Magento/Install/Test/Block/Install.php | 2 +-
.../functional/tests/app/Magento/Install/Test/Block/Landing.php | 2 +-
.../functional/tests/app/Magento/Install/Test/Block/License.php | 2 +-
.../tests/app/Magento/Install/Test/Block/Readiness.php | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
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 cd025b734f7..2b18c9ca7a1 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Block;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Create Admin Account block.
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 af5707450b5..5cb44776e60 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Block;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Customize Your Store block.
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 8d5919a7ec9..9dc1134f166 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Block;
use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Database form.
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 8df7ca8d6c0..39b6d49f624 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Install 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 75085d53c75..26c35a82efd 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Landing 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 83f59f7159d..da693a2f49d 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* License 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 72fcfcb1aa2..3c493234b64 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Block;
use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Locator;
/**
* Readiness block.
--
GitLab
From d1ab21fc7956073d4e86eb6db970d8c0d0835b6b Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Fri, 2 Jan 2015 15:48:54 +0200
Subject: [PATCH 025/120] MAGETWO-32079: Alternative WebDriver support
---
.../tests/app/Magento/Install/Test/Block/Install.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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 39b6d49f624..26167d2d058 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
@@ -60,9 +60,9 @@ class Install extends Block
public function getAdminInfo()
{
$adminData = [];
- $rows = $this->_rootElement->find('#admin-info .row')->getElements();
+ $rows = $this->_rootElement->getElements('#admin-info .row');
foreach ($rows as $row) {
- $dataRow = $row->find('div')->getElements();
+ $dataRow = $row->getElements('div');
$key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
$adminData[$key] = $dataRow[1]->getText();
}
@@ -78,9 +78,9 @@ class Install extends Block
public function getDbInfo()
{
$dbData = [];
- $rows = $this->_rootElement->find('#db-info .row')->getElements();
+ $rows = $this->_rootElement->getElements('#db-info .row');
foreach ($rows as $row) {
- $dataRow = $row->find('div')->getElements();
+ $dataRow = $row->getElements('div');
$key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
$dbData[$key] = $dataRow[1]->getText();
}
--
GitLab
From 74ab06e72c0c58cca0a5fdb15fe087fa57cb0dfc Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Mon, 5 Jan 2015 14:34:15 -0600
Subject: [PATCH 026/120] MAGETWO-28380: Totals taxes sorting is different on
order/invoice/refund create and view pages
- updated per code review
---
app/code/Magento/Tax/Helper/Data.php | 18 +++++-------------
.../testsuite/Magento/Tax/Helper/DataTest.php | 6 ++----
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index a30fc64cc96..f6660d68d44 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -682,23 +682,17 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* 'tax_amount' => $taxAmount,
* 'base_tax_amount' => $baseTaxAmount,
* 'title' => $title,
- * 'percent' => $percent,
- * 'type' => $type
+ * 'percent' => $percent
* )
* )
*
* @param array $taxClassAmount
* @param OrderTaxDetailsItemInterface $itemTaxDetail
* @param float $ratio
- * @param string $type
* @return array
*/
- private function _aggregateTaxes(
- $taxClassAmount,
- OrderTaxDetailsItemInterface $itemTaxDetail,
- $ratio,
- $type = 'product'
- ) {
+ private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
+ {
$itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
foreach ($itemAppliedTaxes as $itemAppliedTax) {
$taxAmount = $itemAppliedTax->getAmount() * $ratio;
@@ -711,7 +705,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
if (!isset($taxClassAmount[$taxCode])) {
$taxClassAmount[$taxCode]['title'] = $itemAppliedTax->getTitle();
$taxClassAmount[$taxCode]['percent'] = $itemAppliedTax->getPercent();
- $taxClassAmount[$taxCode]['type'] = $type;
$taxClassAmount[$taxCode]['tax_amount'] = $taxAmount;
$taxClassAmount[$taxCode]['base_tax_amount'] = $baseTaxAmount;
} else {
@@ -835,7 +828,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
}
// Apply any taxes for shipping
- $shippingType = \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING;
$shippingTaxAmount = $salesItem->getShippingTaxAmount();
$originalShippingTaxAmount = $order->getShippingTaxAmount();
if ($shippingTaxAmount && $originalShippingTaxAmount &&
@@ -846,9 +838,9 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$itemTaxDetails = $orderTaxDetails->getItems();
foreach ($itemTaxDetails as $itemTaxDetail) {
//Aggregate taxable items associated with shipping
- if ($itemTaxDetail->getType() == $shippingType) {
+ if ($itemTaxDetail->getType() == \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING) {
$taxClassAmount =
- $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio, $shippingType);
+ $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
}
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
index 6b01c6385e2..aabfe565bb7 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
@@ -301,7 +301,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
'percent' => 20.0,
'tax_amount' => 2.5,
'base_tax_amount' => 2.5,
- 'type' => 'product',
],
],
],
@@ -363,11 +362,11 @@ class DataTest extends \PHPUnit_Framework_TestCase
'percent' => 20.0,
'tax_amount' => 6.5,
'base_tax_amount' => 6.5,
- 'type' => 'product',
],
],
],
//Scenario 3: one item, with both shipping and product taxes
+ // note that 'shipping tax' is listed before 'product tax'
'one_item_with_both_shipping_and_product_taxes' => [
'order' => [
'order_id' => 1,
@@ -418,20 +417,19 @@ class DataTest extends \PHPUnit_Framework_TestCase
),
],
],
+ // note that 'shipping tax' is now listed after 'product tax'
'expected_results' => [
[
'title' => 'US-CA-Sales-Tax',
'percent' => 20.0,
'tax_amount' => 5.00,
'base_tax_amount' => 5.00,
- 'type' => 'product',
],
[
'title' => 'US-CA-Sales-Tax-Ship',
'percent' => 10.0,
'tax_amount' => 2.00,
'base_tax_amount' => 2.00,
- 'type' => 'shipping',
],
],
],
--
GitLab
From efdfa434c1cc01fb412924fdddee63d861a14dca Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Tue, 6 Jan 2015 11:43:03 +0200
Subject: [PATCH 027/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- CR fixes
---
...axCalculationAfterCheckoutDownloadable.php | 2 +-
...axRuleIsAppliedToAllPricesDownloadable.php | 2 +-
...iedToAllPricesDownloadableExcludingTax.php | 2 +-
...iedToAllPricesDownloadableIncludingTax.php | 2 +-
.../GroupPriceOptions.php | 11 +-
.../DownloadableTaxCalculationTest.php | 2 +-
.../DownloadableTaxCalculationTest/test.csv | 16 +-
.../Adminhtml/Order/AbstractForm/Totals.php | 210 ------------------
.../Block/Adminhtml/Order/Invoice/Totals.php | 2 +-
.../Test/Block/Adminhtml/Order/Totals.php | 204 ++++++++++++++++-
.../AbstractAssertOrderTaxOnBackend.php | 54 +++--
...tractAssertTaxCalculationAfterCheckout.php | 16 ++
...tractAssertTaxRuleIsAppliedToAllPrices.php | 25 +++
...OrderTaxOnBackendExcludingIncludingTax.php | 6 +-
14 files changed, 294 insertions(+), 260 deletions(-)
delete mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
index 7bc83be16a6..290600821df 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
@@ -16,7 +16,7 @@ use Magento\Tax\Test\Constraint\AbstractAssertTaxCalculationAfterCheckout;
/**
* Checks that prices excl tax on order review and customer order pages are equal to specified in dataset.
*/
-class AbstractAssertTaxCalculationAfterCheckoutDownloadable extends AbstractAssertTaxCalculationAfterCheckout
+abstract class AbstractAssertTaxCalculationAfterCheckoutDownloadable extends AbstractAssertTaxCalculationAfterCheckout
{
/**
* Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
index 6075d98c4c5..35da65f95f2 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
@@ -16,7 +16,7 @@ use Mtf\Fixture\InjectableFixture;
/**
* Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset.
*/
-class AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable extends AbstractAssertTaxRuleIsAppliedToAllPrices
+abstract class AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable extends AbstractAssertTaxRuleIsAppliedToAllPrices
{
/**
* Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
index d22ef997023..8845f254596 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
@@ -53,7 +53,7 @@ class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax
/**
* Get totals.
*
- * @param $actualPrices
+ * @param array $actualPrices
* @return array
*/
public function getTotals($actualPrices)
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
index 3c824099019..2ce8b695acb 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
@@ -21,7 +21,7 @@ class AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax
/**
* Get prices on category page.
*
- * @param $productName
+ * @param string $productName
* @param array $actualPrices
* @return array
*/
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
index 14a1482d939..ef1024f4013 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
@@ -1,19 +1,12 @@
<?php
/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
/**
- * Class GroupPriceOptions
- *
- * Data keys:
- * - preset (Price options preset name)
- * - products (comma separated sku identifiers)
+ * Group price options fixture for downloadable product
*/
class GroupPriceOptions extends \Magento\Catalog\Test\Fixture\CatalogProductSimple\GroupPriceOptions
{
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
index bc7d8f9327e..e9316abf81d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
@@ -8,7 +8,7 @@ namespace Magento\Downloadable\Test\TestCase;
use Magento\Tax\Test\TestCase\TaxCalculationTest;
/**
- * Test DownloadableTaxCalculationTest
+ * Test tax calculation with downloadable product.
*
* Test Flow:
* Steps:
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
index b173ea5f5a2..c8778e2a9f0 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
@@ -1,17 +1,7 @@
"description";"configData";"product";"salesRule";"catalogRule";"taxRule";"customer/dataSet";"qty";"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_price_excl_tax";"prices/cart_item_price_incl_tax";"prices/cart_item_subtotal_excl_tax";"prices/cart_item_subtotal_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";"issue"
-"Downloadable product with sales rule, customer tax equals store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_exin";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_equals_store_rate";"johndoe_unique";"-";"20.00";"21.65";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"12.45";"";"";"0.87";"10.55";"11.42";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
+"Downloadable product with sales rule, customer tax equals store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_equals_store_rate";"johndoe_unique";"-";"20.00";"21.65";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"12.45";"";"";"0.87";"10.55";"11.42";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
"Downloadable product with catalog rule, customer tax greater than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"";"16.26";"";"19.51";"";"19.51";"";"19.51";"";"19.51";"";"";"";"1.51";"18.00";"19.51";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
"Downloadable product with sales rule, customer tax less than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"20.00";"";"23.00";"";"23.00";"";"23.00";"";"23.00";"";"12.45";"";"";"0.87";"11.42";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";""
-"Downloadable product with catalog rule, customer tax greater than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_exin";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"9.24";"10.01";"12.01";"13.01";"12.01";"13.02";"12.01";"13.02";"12.01";"13.02";"";"";"";"1.01";"12.01";"13.02";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
+"Downloadable product with catalog rule, customer tax greater than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl_incl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"9.24";"10.01";"12.01";"13.01";"12.01";"13.02";"12.01";"13.02";"12.01";"13.02";"";"";"";"1.01";"12.01";"13.02";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
"Downloadable product with sales rule, customer tax less than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_incl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"";"19.98";"";"22.98";"";"22.97";"";"22.97";"";"22.97";"10.61";"";"";"1.75";"10.61";"12.36";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
-"Downloadable product with catalog rule, customer tax equals store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_equals_store_rate";"johndoe_unique";"-";"9.24";"";"12.01";"";"12.01";"";"12.01";"";"12.01";"";"";"";"";"0.99";"13.00";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";"MAGETWO-32057"
-
-
-
-
-
-
-
-
-
-
+"Downloadable product with catalog rule, customer tax equals store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_equals_store_rate";"johndoe_unique";"-";"9.24";"";"12.01";"";"12.01";"";"12.01";"";"12.01";"";"";"";"";"0.99";"13.00";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";"MAGETWO-32057"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
deleted file mode 100644
index e1e57b8961f..00000000000
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Totals.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license {license_link}
- */
-
-namespace Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm;
-
-use Mtf\Block\Block;
-use Mtf\Client\Element\Locator;
-
-/**
- * Invoice totals block
- */
-class Totals extends Block
-{
- /**
- * Grand total search mask
- *
- * @var string
- */
- protected $grandTotal = '//tr[normalize-space(td)="Grand Total"]//span';
-
- /**
- * Grand total excluding tax search mask
- *
- * @var string
- */
- protected $grandTotalExclTax = '//tr[normalize-space(td)="Grand Total (Excl.Tax)"]//span';
-
- /**
- * Grand total including tax search mask
- *
- * @var string
- */
- protected $grandTotalInclTax = '//tr[normalize-space(td)="Grand Total (Incl.Tax)"]//span';
-
- /**
- * Subtotal search mask
- *
- * @var string
- */
- protected $subtotal = '//tr[normalize-space(td)="Subtotal"]//span';
-
- /**
- * Subtotal excluding tax search mask
- *
- * @var string
- */
- protected $subtotalExclTax = '//tr[normalize-space(td)="Subtotal (Excl.Tax)"]//span';
-
- /**
- * Subtotal including tax search mask
- *
- * @var string
- */
- protected $subtotalInclTax = '//tr[normalize-space(td)="Subtotal (Incl.Tax)"]//span';
-
- /**
- * Tax search mask
- *
- * @var string
- */
- protected $tax = '//tr[normalize-space(td)="Tax"]//span';
-
- /**
- * Discount search mask
- *
- * @var string
- */
- protected $discount = '//tr[normalize-space(td)="Discount"]//span';
-
- /**
- * Shipping excluding tax search mask
- *
- * @var string
- */
- protected $shippingExclTax = '//tr[contains (.,"Shipping") and contains (.,"(Excl.Tax)")]//span';
-
- /**
- * Shipping including tax search mask
- *
- * @var string
- */
- protected $shippingInclTax = '//tr[contains (.,"Shipping") and contains (.,"(Incl.Tax)")]//span';
-
- /**
- * Get Grand Total Text
- *
- * @return string
- */
- public function getGrandTotal()
- {
- $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText();
- return $this->escapeCurrency($grandTotal);
- }
-
- /**
- * Get Grand Total Excluding Tax Text
- *
- * @return string
- */
- public function getGrandTotalExclTax()
- {
- $grandTotal = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_XPATH)->getText();
- return $this->escapeCurrency($grandTotal);
- }
-
- /**
- * Get Grand Total Including Tax Text
- *
- * @return string
- */
- public function getGrandTotalInclTax()
- {
- $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_XPATH)->getText();
- return $this->escapeCurrency($grandTotal);
- }
-
- /**
- * Get Tax text from Order Totals
- *
- * @return string
- */
- public function getTax()
- {
- $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_XPATH)->getText();
- return $this->escapeCurrency($tax);
- }
-
- /**
- * Get Tax text from Order Totals
- *
- * @return string|null
- */
- public function getDiscount()
- {
- $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_XPATH);
- return $discount->isVisible() ? $this->escapeCurrency($discount->getText()) : null;
- }
-
- /**
- * Get Subtotal text
- *
- * @return string
- */
- public function getSubtotal()
- {
- $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_XPATH)->getText();
- return $this->escapeCurrency($subTotal);
- }
-
- /**
- * Get Subtotal text
- *
- * @return string
- */
- public function getSubtotalExclTax()
- {
- $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_XPATH)->getText();
- return $this->escapeCurrency($subTotal);
- }
-
- /**
- * Get Subtotal text
- *
- * @return string
- */
- public function getSubtotalInclTax()
- {
- $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_XPATH)->getText();
- return $this->escapeCurrency($subTotal);
- }
-
- /**
- * Get Shipping Excluding tax price text
- *
- * @return string|null
- */
- public function getShippingInclTax()
- {
- $subTotal = $this->_rootElement->find($this->shippingInclTax, Locator::SELECTOR_XPATH);
- return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
- }
-
- /**
- * Get Shipping Including tax price text
- *
- * @return string|null
- */
- public function getShippingExclTax()
- {
- $subTotal = $this->_rootElement->find($this->shippingExclTax, Locator::SELECTOR_XPATH);
- return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
- }
-
- /**
- * Method that escapes currency symbols
- *
- * @param string $price
- * @return string|null
- */
- protected function escapeCurrency($price)
- {
- preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
- return (isset($matches[1])) ? $matches[1] : null;
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
index 819c75229fa..158a0f9abc0 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
@@ -11,7 +11,7 @@ use Mtf\Client\Element\Locator;
* Class Totals
* Invoice totals block
*/
-class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Totals
+class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\Totals
{
/**
* Submit invoice button selector
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index 88b5b445d3f..98d5718ae0f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
@@ -1,14 +1,210 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license {license_link}
*/
namespace Magento\Sales\Test\Block\Adminhtml\Order;
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
/**
- * Order totals block
+ * Invoice totals block
*/
-class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Totals
+class Totals extends Block
{
- //
+ /**
+ * Grand total search mask.
+ *
+ * @var string
+ */
+ protected $grandTotal = '//tr[normalize-space(td)="Grand Total"]//span';
+
+ /**
+ * Grand total excluding tax search mask.
+ *
+ * @var string
+ */
+ protected $grandTotalExclTax = '//tr[normalize-space(td)="Grand Total (Excl.Tax)"]//span';
+
+ /**
+ * Grand total including tax search mask.
+ *
+ * @var string
+ */
+ protected $grandTotalInclTax = '//tr[normalize-space(td)="Grand Total (Incl.Tax)"]//span';
+
+ /**
+ * Subtotal search mask.
+ *
+ * @var string
+ */
+ protected $subtotal = '//tr[normalize-space(td)="Subtotal"]//span';
+
+ /**
+ * Subtotal excluding tax search mask.
+ *
+ * @var string
+ */
+ protected $subtotalExclTax = '//tr[normalize-space(td)="Subtotal (Excl.Tax)"]//span';
+
+ /**
+ * Subtotal including tax search mask.
+ *
+ * @var string
+ */
+ protected $subtotalInclTax = '//tr[normalize-space(td)="Subtotal (Incl.Tax)"]//span';
+
+ /**
+ * Tax search mask.
+ *
+ * @var string
+ */
+ protected $tax = '//tr[normalize-space(td)="Tax"]//span';
+
+ /**
+ * Discount search mask.
+ *
+ * @var string
+ */
+ protected $discount = '//tr[normalize-space(td)="Discount"]//span';
+
+ /**
+ * Shipping excluding tax search mask.
+ *
+ * @var string
+ */
+ protected $shippingExclTax = '//tr[contains (.,"Shipping") and contains (.,"(Excl.Tax)")]//span';
+
+ /**
+ * Shipping including tax search mask.
+ *
+ * @var string
+ */
+ protected $shippingInclTax = '//tr[contains (.,"Shipping") and contains (.,"(Incl.Tax)")]//span';
+
+ /**
+ * Get Grand Total Text.
+ *
+ * @return string
+ */
+ public function getGrandTotal()
+ {
+ $grandTotal = $this->_rootElement->find($this->grandTotal, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($grandTotal);
+ }
+
+ /**
+ * Get Grand Total Excluding Tax Text.
+ *
+ * @return string
+ */
+ public function getGrandTotalExclTax()
+ {
+ $grandTotal = $this->_rootElement->find($this->grandTotalExclTax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($grandTotal);
+ }
+
+ /**
+ * Get Grand Total Including Tax Text.
+ *
+ * @return string
+ */
+ public function getGrandTotalInclTax()
+ {
+ $grandTotal = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($grandTotal);
+ }
+
+ /**
+ * Get Tax text from Order Totals.
+ *
+ * @return string
+ */
+ public function getTax()
+ {
+ $tax = $this->_rootElement->find($this->tax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($tax);
+ }
+
+ /**
+ * Get Tax text from Order Totals.
+ *
+ * @return string|null
+ */
+ public function getDiscount()
+ {
+ $discount = $this->_rootElement->find($this->discount, Locator::SELECTOR_XPATH);
+ return $discount->isVisible() ? $this->escapeCurrency($discount->getText()) : null;
+ }
+
+ /**
+ * Get Subtotal text.
+ *
+ * @return string
+ */
+ public function getSubtotal()
+ {
+ $subTotal = $this->_rootElement->find($this->subtotal, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($subTotal);
+ }
+
+ /**
+ * Get Subtotal text.
+ *
+ * @return string
+ */
+ public function getSubtotalExclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->subtotalExclTax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($subTotal);
+ }
+
+ /**
+ * Get Subtotal text.
+ *
+ * @return string
+ */
+ public function getSubtotalInclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->subtotalInclTax, Locator::SELECTOR_XPATH)->getText();
+ return $this->escapeCurrency($subTotal);
+ }
+
+ /**
+ * Get Shipping Excluding tax price text.
+ *
+ * @return string|null
+ */
+ public function getShippingInclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->shippingInclTax, Locator::SELECTOR_XPATH);
+ return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+ }
+
+ /**
+ * Get Shipping Including tax price text.
+ *
+ * @return string|null
+ */
+ public function getShippingExclTax()
+ {
+ $subTotal = $this->_rootElement->find($this->shippingExclTax, Locator::SELECTOR_XPATH);
+ return $subTotal->isVisible() ? $this->escapeCurrency($subTotal->getText()) : null;
+ }
+
+ /**
+ * Method that escapes currency symbols.
+ *
+ * @param string $price
+ * @return string|null
+ */
+ protected function escapeCurrency($price)
+ {
+ preg_match("/^\\D*\\s*([\\d,\\.]+)\\s*\\D*$/", $price, $matches);
+ return (isset($matches[1])) ? $matches[1] : null;
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
index aa48b9bf01c..b7c81790948 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -45,12 +45,36 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
*/
protected $severeness = 'high';
+ /**
+ * Implementation assert
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ abstract protected function getOrderTotals($actualPrices);
+
+ /**
+ * Implementation assert
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ abstract protected function getInvoiceNewTotals($actualPrices);
+
+ /**
+ * Implementation getCreditMemoNewTotals
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ abstract protected function getCreditMemoNewTotals($actualPrices);
+
/**
* Assert that specified prices are actual on order, invoice and refund pages.
*
* @param array $prices
* @param InjectableFixture $product
- * @param OrderIndex $orderIndex ,
+ * @param OrderIndex $orderIndex
* @param OrderView $orderView
* @param OrderInvoiceNew $orderInvoiceNew
* @param OrderCreditMemoNew $orderCreditMemoNew
@@ -115,18 +139,18 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
*/
protected function preparePrices($prices)
{
- if (isset($prices['category_price_excl_tax'])) {
- unset($prices['category_price_excl_tax']);
- }
- if (isset($prices['category_price_incl_tax'])) {
- unset($prices['category_price_incl_tax']);
- }
- if (isset($prices['product_view_price_excl_tax'])) {
- unset($prices['product_view_price_excl_tax']);
- }
- if (isset($prices['product_view_price_incl_tax'])) {
- unset($prices['product_view_price_incl_tax']);
+ $deletePrices = [
+ 'category_price_excl_tax',
+ 'category_price_incl_tax',
+ 'product_view_price_excl_tax',
+ 'product_view_price_incl_tax'
+ ];
+ foreach ($deletePrices as $key) {
+ if (array_key_exists($key, $prices)) {
+ unset($prices[$key]);
+ }
}
+
return $prices;
}
@@ -147,7 +171,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
* Get order product prices.
*
* @param InjectableFixture $product
- * @param $actualPrices
+ * @param array $actualPrices
* @return array
*/
public function getOrderPrices($actualPrices, InjectableFixture $product)
@@ -164,7 +188,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
* Get invoice new product prices.
*
* @param InjectableFixture $product
- * @param $actualPrices
+ * @param array $actualPrices
* @return array
*/
public function getInvoiceNewPrices($actualPrices, InjectableFixture $product)
@@ -181,7 +205,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
* Get Credit Memo new product prices.
*
* @param InjectableFixture $product
- * @param $actualPrices
+ * @param array $actualPrices
* @return array
*/
public function getCreditMemoNewPrices($actualPrices, InjectableFixture $product)
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
index e83ccc15583..51c7b44bf0b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -39,6 +39,22 @@ abstract class AbstractAssertTaxCalculationAfterCheckout extends AbstractConstra
*/
protected $severeness = 'high';
+ /**
+ * Implementation getReviewTotals
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ abstract protected function getReviewTotals($actualPrices);
+
+ /**
+ * Implementation getOrderTotals
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ abstract protected function getOrderTotals($actualPrices);
+
/**
* Assert that prices on order review and customer order pages are equal to specified in dataset.
*
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
index 6eb167d44c4..52cb287f119 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
@@ -54,6 +54,31 @@ abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstra
*/
protected $severeness = 'high';
+ /**
+ * Implementation getCategoryPrices
+ *
+ * @param string $productName
+ * @param array $actualPrices
+ * @return array
+ */
+ abstract protected function getCategoryPrices($productName, $actualPrices);
+
+ /**
+ * Implementation getProductPagePrices
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ abstract protected function getProductPagePrices($actualPrices);
+
+ /**
+ * Implementation getTotals
+ *
+ * @param array $actualPrices
+ * @return array
+ */
+ abstract protected function getTotals($actualPrices);
+
/**
* Assert that specified prices are actual on category, product and cart pages.
*
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
index 35c2ef23572..66ecdadac13 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
@@ -20,7 +20,7 @@ class AssertOrderTaxOnBackendExcludingIncludingTax extends AbstractAssertOrderTa
/**
* Get order totals.
*
- * @param $actualPrices
+ * @param array $actualPrices
* @return array
*/
public function getOrderTotals($actualPrices)
@@ -43,7 +43,7 @@ class AssertOrderTaxOnBackendExcludingIncludingTax extends AbstractAssertOrderTa
/**
* Get invoice new totals.
*
- * @param $actualPrices
+ * @param array $actualPrices
* @return array
*/
public function getInvoiceNewTotals($actualPrices)
@@ -67,7 +67,7 @@ class AssertOrderTaxOnBackendExcludingIncludingTax extends AbstractAssertOrderTa
/**
* Get Credit Memo new totals.
*
- * @param $actualPrices
+ * @param array $actualPrices
* @return array
*/
public function getCreditMemoNewTotals($actualPrices)
--
GitLab
From 40219a6e637cf3c3fe9b038df2d599dbccf5207b Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Tue, 6 Jan 2015 02:15:22 -0800
Subject: [PATCH 028/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- dev/* code marked with @SuppressWarnings annotations
---
.../Interception/Fixture/Intercepted.php | 24 +++++++++++++++++++
.../Fixture/Intercepted/InterfacePlugin.php | 10 ++++++++
.../Fixture/Intercepted/Plugin.php | 18 ++++++++++++++
.../Fixture/InterceptedInterface.php | 6 +++++
.../Fixture/InterceptedParent.php | 6 +++++
.../Fixture/InterceptedParentInterface.php | 3 +++
.../Report/Product/Viewed/CollectionTest.php | 2 ++
.../Model/Calculation/RateRepositoryTest.php | 1 +
.../Integrity/Modular/TemplateFilesTest.php | 1 +
.../Integrity/Theme/TemplateFilesTest.php | 1 +
.../phpmd/input/cyclomatic_complexity.php | 1 +
.../phpmd/input/descendant_count.php | 3 +++
.../CodeMessTest/phpmd/input/field_count.php | 1 +
.../phpmd/input/method_length.php | 1 +
.../CodeMessTest/phpmd/input/naming.php | 5 ++++
.../phpmd/input/parameter_list.php | 1 +
.../phpmd/input/prohibited_statement.php | 6 +++++
.../phpmd/input/prohibited_statement_goto.php | 3 +++
.../CodeMessTest/phpmd/input/public_count.php | 1 +
.../CodeMessTest/phpmd/input/unused.php | 12 ++++++++++
.../coding_style/classes/normal_class.php | 1 +
.../functions/multiline_wrong_declaration.php | 5 ++++
.../coding_style/functions/normal_func.php | 2 ++
.../functions/unneeded_multiline.php | 1 +
.../naming/constant/minuscule_letter.php | 3 +++
.../naming/method/normal_underscore_start.php | 3 +++
.../naming/property/normal_underscore.php | 3 +++
.../Backend/Model/Session/QuoteTest.php | 2 ++
.../Bundle/Model/OptionRepositoryTest.php | 3 +++
.../Price/BundleSelectionPriceTest.php | 1 +
.../Adminhtml/Category/SaveTest.php | 3 +++
.../Controller/Product/Compare/IndexTest.php | 4 ++++
.../Magento/Catalog/Model/CategoryTest.php | 4 ++++
.../Model/Layer/Filter/AttributeTest.php | 6 +++++
.../Filter/DataProvider/CategoryTest.php | 3 +++
.../Catalog/Model/Layer/Filter/PriceTest.php | 4 ++++
.../Magento/Catalog/Model/LayerTest.php | 1 +
.../Model/Product/LinkTypeProviderTest.php | 3 +++
.../Catalog/Model/Rss/CategoryTest.php | 3 +++
.../CatalogInventory/Model/ObserverTest.php | 3 +++
.../Model/Spi/StockRegistryProviderTest.php | 3 +++
.../Model/Layer/Filter/AttributeTest.php | 6 +++++
.../Model/Layer/Filter/CategoryTest.php | 3 +++
.../Model/Layer/Filter/PriceTest.php | 1 +
.../Block/Product/ProductsListTest.php | 1 +
.../Checkout/Controller/Onepage/IndexTest.php | 3 +++
.../Magento/Checkout/Helper/CartTest.php | 1 +
.../Checkout/Model/Type/OnepageTest.php | 4 ++++
.../Model/Product/Validator/PluginTest.php | 1 +
.../Pricing/Price/AttributePriceTest.php | 3 +++
.../Customer/Block/Widget/NameTest.php | 1 +
.../Controller/Account/CreatePostTest.php | 3 +++
.../Controller/Varien/Router/StandardTest.php | 1 +
.../Magento/Framework/Message/ManagerTest.php | 3 +++
.../Model/Product/Type/GroupedTest.php | 3 +++
.../Block/Header/AdditionalTest.php | 2 ++
.../Condition/Product/AbstractProductTest.php | 2 ++
.../Order/Creditmemo/NewActionTest.php | 1 +
.../Order/Creditmemo/PrintActionTest.php | 1 +
.../Adminhtml/Order/Creditmemo/ViewTest.php | 4 ++++
.../Sales/Model/AdminOrder/CreateTest.php | 3 +++
.../Quote/Address/CollectTotalsTest.php | 6 +++++
.../Magento/Sales/Model/QuoteTest.php | 4 ++++
.../Magento/SalesRule/Model/UtilityTest.php | 1 +
.../Adminhtml/Order/Shipment/AddTrackTest.php | 3 +++
.../Order/Shipment/NewActionTest.php | 3 +++
.../Adminhtml/Order/Shipment/ViewTest.php | 1 +
.../testsuite/Magento/Tax/Helper/DataTest.php | 1 +
.../Tax/Model/Sales/Total/Quote/TaxTest.php | 1 +
.../Magento/Ui/Component/FilterPoolTest.php | 1 +
.../Magento/Ui/Component/ListingTest.php | 3 +++
.../Wishlist/Controller/Index/CartTest.php | 16 +++++++++++++
72 files changed, 254 insertions(+)
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
index 84988bbba5b..d005d25826a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
@@ -9,42 +9,66 @@ class Intercepted extends InterceptedParent implements InterceptedInterface
{
protected $_key;
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function A($param1)
{
$this->_key = $param1;
return $this;
}
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function B($param1, $param2)
{
return '<B>' . $param1 . $param2 . $this->C($param1) . '</B>';
}
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function C($param1)
{
return '<C>' . $param1 . '</C>';
}
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function D($param1)
{
return '<D>' . $this->_key . $param1 . '</D>';
}
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
final public function E($param1)
{
return '<E>' . $this->_key . $param1 . '</E>';
}
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function F($param1)
{
return '<F>' . $param1 . '</F>';
}
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function G($param1)
{
return '<G>' . $param1 . "</G>";
}
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function K($param1)
{
return '<K>' . $param1 . '</K>';
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/InterfacePlugin.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/InterfacePlugin.php
index 40a95354897..7524be69a24 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/InterfacePlugin.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/InterfacePlugin.php
@@ -14,6 +14,7 @@ class InterfacePlugin
* @param \Closure $next
* @param string $param1
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundC(InterceptedInterface $subject, \Closure $next, $param1)
{
@@ -31,16 +32,25 @@ class InterfacePlugin
return '<IP:F>' . $subject->D($next($subject->C($param1))) . '</IP:F>';
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
public function beforeG(InterceptedInterface $subject, $param1)
{
return ['<IP:bG>' . $param1 . '</IP:bG>'];
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
public function aroundG(InterceptedInterface $subject, \Closure $next, $param1)
{
return $next('<IP:G>' . $param1 . '</IP:G>');
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
public function afterG(InterceptedInterface $subject, $result)
{
return '<IP:aG>' . $result . '</IP:aG>';
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/Plugin.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/Plugin.php
index 06e04190ae4..bb5c28aa280 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/Plugin.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted/Plugin.php
@@ -14,33 +14,51 @@ class Plugin
*/
protected $_counter = 0;
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
public function aroundC(Intercepted $subject, \Closure $next, $param1)
{
return '<P:C>' . $next($param1) . '</P:C>';
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
public function aroundD(Intercepted $subject, \Closure $next, $param1)
{
$this->_counter++;
return '<P:D>' . $this->_counter . ': ' . $next($param1) . '</P:D>';
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
public function aroundK(Intercepted $subject, \Closure $next, $param1)
{
$result = $subject->C($param1);
return '<P:K>' . $subject->F($result) . '</P:K>';
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
public function beforeG(Intercepted $subject, $param1)
{
return ['<P:bG>' . $param1 . '</P:bG>'];
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
public function aroundG(Intercepted $subject, \Closure $next, $param1)
{
return $next('<P:G>' . $param1 . '</P:G>');
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
public function afterG(Intercepted $subject, $result)
{
return '<P:aG>' . $result . '</P:aG>';
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedInterface.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedInterface.php
index fb4de8212a8..7a951369e38 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedInterface.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedInterface.php
@@ -7,7 +7,13 @@ namespace Magento\Framework\Interception\Fixture;
interface InterceptedInterface
{
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function C($param1);
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function F($param1);
}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParent.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParent.php
index 507bb5e20ba..72ec8842a52 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParent.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParent.php
@@ -7,11 +7,17 @@ namespace Magento\Framework\Interception\Fixture;
class InterceptedParent implements InterceptedParentInterface
{
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function A($param1)
{
return 'A' . $param1 . 'A';
}
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function B($param1, $param2)
{
return $param1 . $param2 . $this->A($param1);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParentInterface.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParentInterface.php
index 8107018237f..263e6d7bab5 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParentInterface.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParentInterface.php
@@ -7,5 +7,8 @@ namespace Magento\Framework\Interception\Fixture;
interface InterceptedParentInterface
{
+ /**
+ * @SuppressWarnings(PHPMD.ShortMethodName)
+ */
public function A($param1);
}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php
index cffacf9534c..50c12e37336 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php
@@ -46,6 +46,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
* @param $dateFrom
* @param $dateTo
* @param $isTotal
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function testTableSelection($period, $expectedTable, $dateFrom, $dateTo, $isTotal = false)
{
@@ -91,6 +92,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
* Data provider for testTableSelection
*
* @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function tableForPeriodDataProvider()
{
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
index 0c844893cfb..e35fbb77d47 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
@@ -506,6 +506,7 @@ class RateRepositoryTest extends \PHPUnit_Framework_TestCase
*
* @magentoDbIsolation enabled
* @dataProvider searchTaxRatesDataProvider
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function testGetList($filters, $filterGroup, $expectedRateCodes)
{
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
index 8547aaa4909..802b42be3c8 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
@@ -42,6 +42,7 @@ class TemplateFilesTest extends \Magento\TestFramework\TestCase\AbstractIntegrit
/**
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function allTemplatesDataProvider()
{
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/TemplateFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/TemplateFilesTest.php
index 9f6aa570bc6..d308e7128f8 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/TemplateFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/TemplateFilesTest.php
@@ -61,6 +61,7 @@ class TemplateFilesTest extends \Magento\TestFramework\TestCase\AbstractIntegrit
*
* @param \SimpleXMLElement $layoutXml
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _getLayoutTemplates($layoutXml)
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/cyclomatic_complexity.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/cyclomatic_complexity.php
index e78ad0a73d1..2795d100cc8 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/cyclomatic_complexity.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/cyclomatic_complexity.php
@@ -4,6 +4,7 @@ abstract class Foo
{
/**
* Method that violates the allowed cyclomatic complexity
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function bar()
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/descendant_count.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/descendant_count.php
index a559b0c1f59..4c035e76005 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/descendant_count.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/descendant_count.php
@@ -1,5 +1,8 @@
<?php
+/**
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_descendant_count
{
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/field_count.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/field_count.php
index 3e07302931d..397ece72b54 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/field_count.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/field_count.php
@@ -2,6 +2,7 @@
/**
* Class that violates the allowed field number
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
abstract class Foo
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/method_length.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/method_length.php
index 48a58a39dbe..2f0ca8b5370 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/method_length.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/method_length.php
@@ -4,6 +4,7 @@ class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_method_length
{
/**
* Method that violates the allowed method length
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function bar() // 001
{ // 002
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/naming.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/naming.php
index d2b6e1de984..22280954a78 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/naming.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/naming.php
@@ -1,5 +1,8 @@
<?php
+/**
+ * @SuppressWarnings(PHPMD.ConstantNamingConventions)
+ */
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_naming
{
const nonUppercaseName = false;
@@ -28,6 +31,7 @@ class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_naming
/**
* Too short method name
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
protected function _x()
{
@@ -36,6 +40,7 @@ class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_naming
/**
* Getter that returns boolean value should be named 'is...()' or 'has...()'
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getBoolValue()
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/parameter_list.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/parameter_list.php
index 59f733a5301..30b9260dbaa 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/parameter_list.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/parameter_list.php
@@ -4,6 +4,7 @@ class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_parameter_list
{
/**
* Method that violates the allowed parameter list length
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function bar($param1, $param2, $param3, $param4, $param5, $param6, $param7, $param8, $param9, $param10)
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement.php
index 17639a25e72..49dc3365e49 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement.php
@@ -2,11 +2,17 @@
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_prohibited_statement
{
+ /**
+ * @SuppressWarnings(PHPMD.ExitExpression)
+ */
public function terminateApplication($exitCode = 0)
{
exit($exitCode);
}
+ /**
+ * @SuppressWarnings(PHPMD.EvalExpression)
+ */
public function evaluateExpression($expression)
{
return eval($expression);
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement_goto.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement_goto.php
index 69cbbddcbf6..8fe82d85b96 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement_goto.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement_goto.php
@@ -2,6 +2,9 @@
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_prohibited_statement_goto
{
+ /**
+ * @SuppressWarnings(PHPMD.GotoStatement)
+ */
public function loopArrayCallback(array $array, $callback)
{
$index = 0;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/public_count.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/public_count.php
index 89cc599042d..cede88939f0 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/public_count.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/public_count.php
@@ -7,6 +7,7 @@
*
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.TooManyMethods)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
*/
abstract class Foo
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/unused.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/unused.php
index c1b9b30a59c..f5edffd765b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/unused.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/unused.php
@@ -1,13 +1,25 @@
<?php
+/**
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
+ */
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_unused
{
private $_unusedField;
+ /**
+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+ */
private function _unusedMethod()
{
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
public function bar($unusedParameter)
{
$unusedLocalVariable = 'unused value';
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/classes/normal_class.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/classes/normal_class.php
index 4ec266905e6..fe93af54335 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/classes/normal_class.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/classes/normal_class.php
@@ -5,6 +5,7 @@
/**
* Doc block for this class
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
*/
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_coding_style_classes_normal_class
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/multiline_wrong_declaration.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/multiline_wrong_declaration.php
index 750b756fa07..7a09f309800 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/multiline_wrong_declaration.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/multiline_wrong_declaration.php
@@ -8,6 +8,7 @@
* @param int $moreEvenLongerParamForAllThatRoutineStuff
* @param float $andThereGoesOneParameter
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
function thereGoesFunc($someLongParam, $anotherLongParam, $moreEvenLongerParamForAllThatRoutineStuff,
$andThereGoesOneParameter
@@ -27,6 +28,7 @@ function thereGoesFunc($someLongParam, $anotherLongParam, $moreEvenLongerParamFo
* @param int $moreEvenLongerParamForAllThatRoutineStuff
* @param float $andThereGoesOneParameter
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
function thereGoesAnotherFunc($someLongParam, $anotherLongParam, $moreEvenLongerParamForAllThatRoutineStuff,
$andThereGoesOneParameter
@@ -46,6 +48,7 @@ function thereGoesAnotherFunc($someLongParam, $anotherLongParam, $moreEvenLonger
* @param int $moreEvenLongerParamForAllThatRoutineStuff
* @param float $andThereGoesOneParameter
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
function thereGoesThirdFunc($someLongParam, $anotherLongParam, $moreEvenLongerParamForAllThatRoutineStuff,
$andThereGoesOneParameter
@@ -65,6 +68,7 @@ function thereGoesThirdFunc($someLongParam, $anotherLongParam, $moreEvenLongerPa
* @param int $moreEvenLongerParamForAllThatRoutineStuff
* @param float $andThereGoesOneParameter
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
function thereGoesFourthFunc($someLongParam, $anotherLongParam, $moreEvenLongerParamForAllThatRoutineStuff,
$andThereGoesOneParameter)
@@ -84,6 +88,7 @@ function thereGoesFourthFunc($someLongParam, $anotherLongParam, $moreEvenLongerP
* @param int $moreEvenLongerParamForAllThatRoutineStuff
* @param float $andThereGoesOneParameter
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
function thereGoesFifthFunc($someLongParam, $anotherLongParam, $moreEvenLongerParamForAllThatRoutineStuff,
$andThereGoesOneParameter)
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/normal_func.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/normal_func.php
index acd5360c0f1..c2567f2fbe9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/normal_func.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/normal_func.php
@@ -23,6 +23,8 @@ function someFunc($inParam)
* @param int $moreEvenLongerParamForAllThatRoutineStuff
* @param float $andThereGoesOneParameter
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
function anotherFunc($someLongParam, $anotherLongParam, $moreEvenLongerParamForAllThatRoutineStuff,
$andThereGoesOneParameter
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/unneeded_multiline.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/unneeded_multiline.php
index c32855bbeb6..e4d2fe3639e 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/unneeded_multiline.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/unneeded_multiline.php
@@ -6,6 +6,7 @@
* @param string|null $a
* @param bool $b
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
function thereGoesFunc($a,
$b
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
index ae52ab28aed..9f2166f5946 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
@@ -1,6 +1,9 @@
<?php
define('SOME_CONSTaNT_2_ACT_4_YOU', 42);
define("SOME_CONSTaNT_2_ACT_4_YOU", 2783);
+/**
+ * @SuppressWarnings(PHPMD.ConstantNamingConventions)
+ */
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_constant_minuscule_letter
{
const SOME_LONG_CONSTaNT_2_ACT_4_YOU = 1;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
index eb8932a74cc..6fffaa5f938 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
@@ -1,6 +1,9 @@
<?php
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_method_normal_underscore_start
{
+ /**
+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+ */
private function _testFunctionPrivate()
{
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/property/normal_underscore.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/property/normal_underscore.php
index eaae0279975..c722fe07a81 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/property/normal_underscore.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/property/normal_underscore.php
@@ -1,4 +1,7 @@
<?php
+/**
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
+ */
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_property_normal_underscore
{
private $_private = 1;
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
index 2d5ab2f3d50..4ffed31fcb8 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
@@ -6,6 +6,7 @@ namespace Magento\Backend\Model\Session;
/**
* Class QuoteTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class QuoteTest extends \PHPUnit_Framework_TestCase
{
@@ -88,6 +89,7 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
* Set up
*
* @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function setUp()
{
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
index e4f9ee3ff9a..316780a27b0 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
@@ -338,6 +338,9 @@ class OptionRepositoryTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
public function testUpdate()
{
$productId = 1;
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 68adb8e241a..1c77424f303 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/BundleSelectionPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/BundleSelectionPriceTest.php
@@ -163,6 +163,7 @@ class BundleSelectionPriceTest extends \PHPUnit_Framework_TestCase
*
* @param bool $useRegularPrice
* @dataProvider useRegularPriceDataProvider
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function testGetValueTypeDynamic($useRegularPrice)
{
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
index d8d6ab6897c..ebf610fadc3 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
@@ -6,6 +6,7 @@ namespace Magento\Catalog\Controller\Adminhtml\Category;
/**
* Class SaveTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class SaveTest extends \PHPUnit_Framework_TestCase
{
@@ -78,6 +79,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase
* Set up
*
* @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function setUp()
{
@@ -207,6 +209,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase
* @return void
*
* @dataProvider dataProviderExecute
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
{
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 a46b5a2806a..60cafb13995 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
@@ -7,6 +7,10 @@ namespace Magento\Catalog\Controller\Product\Compare;
use Magento\Catalog\Model\Resource\Product\Compare\Item;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class IndexTest extends \PHPUnit_Framework_TestCase
{
/** @var \Magento\Catalog\Controller\Product\Compare\Index */
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
index a918e7be095..a63f7682958 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -5,6 +5,10 @@
namespace Magento\Catalog\Model;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class CategoryTest extends \PHPUnit_Framework_TestCase
{
/** @var \Magento\Catalog\Model\Category */
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
index 90662bb9fdc..7e8032da570 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
@@ -8,6 +8,9 @@ namespace Magento\Catalog\Model\Layer\Filter;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class AttributeTest extends \PHPUnit_Framework_TestCase
{
/** @var \Magento\Catalog\Model\Resource\Layer\Filter\Attribute|MockObject */
@@ -45,6 +48,9 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder|MockObject */
private $itemDataBuilder;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
/** @var \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory */
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/CategoryTest.php
index e8b5cc362ca..2f26990729d 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/CategoryTest.php
@@ -33,6 +33,9 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
*/
private $target;
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
protected function setUp()
{
/** @var \Magento\Framework\Registry $var */
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php
index d9e9655100b..a3ce5758190 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/PriceTest.php
@@ -10,6 +10,7 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
/**
* Test for \Magento\Catalog\Model\Layer\Filter\Price
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
*/
class PriceTest extends \PHPUnit_Framework_TestCase
{
@@ -49,6 +50,9 @@ class PriceTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Catalog\Model\Layer\State|MockObject */
private $state;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
$this->request = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
index 336e84b6d0a..c7831368d96 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
@@ -9,6 +9,7 @@ use Magento\TestFramework\Helper\ObjectManager;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class LayerTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php
index 0638418b149..53bb94fc97d 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php
@@ -62,6 +62,9 @@ class LinkTypeProviderTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
public function testGetItems()
{
$expectedResult = [];
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/CategoryTest.php
index 626b9e97bba..09bbb79f81e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/CategoryTest.php
@@ -86,6 +86,9 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function testGetProductCollection()
{
$storeId = 1;
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ObserverTest.php
index afba5189fc3..c6d302801d6 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ObserverTest.php
@@ -84,6 +84,9 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
*/
protected $eventObserver;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
$this->stockStatus = $this->getMockBuilder('Magento\CatalogInventory\Model\Stock\Status')
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Spi/StockRegistryProviderTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Spi/StockRegistryProviderTest.php
index 8bd5f27b3f3..224a28084df 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Spi/StockRegistryProviderTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Spi/StockRegistryProviderTest.php
@@ -101,6 +101,9 @@ class StockRegistryProviderTest extends \PHPUnit_Framework_TestCase
protected $productSku = 'simple';
protected $websiteId = 111;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
$this->objectManagerHelper = new ObjectManagerHelper($this);
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 85de9a5d768..f67edee41dc 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
@@ -8,6 +8,9 @@ namespace Magento\CatalogSearch\Model\Layer\Filter;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class AttributeTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -229,6 +232,9 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expectedFilterItems, $result);
}
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function testGetItemsWithoutApply()
{
$attributeCode = 'attributeCode';
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php
index c9e2fad0c8a..5b9dbffeeb4 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php
@@ -226,6 +226,9 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
$this->target->apply($this->request);
}
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function testGetItems()
{
$this->category->expects($this->any())
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php
index 2c343b49e26..890c078777f 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php
@@ -10,6 +10,7 @@ use PHPUnit_Framework_MockObject_MockObject as MockObject;
/**
* Test for \Magento\CatalogSearch\Model\Layer\Filter\Price
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
*/
class PriceTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php b/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
index a3e92b426f2..e398d9efc6d 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
@@ -10,6 +10,7 @@ use Magento\Catalog\Model\Product\Visibility;
/**
* Class ProductsListTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ProductsListTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
index 662d082c6fb..ad94bd34381 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
@@ -9,6 +9,9 @@ namespace Magento\Checkout\Controller\Onepage;
use Magento\TestFramework\Helper\ObjectManager as ObjectManager;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ */
class IndexTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
index d0209b44397..dee612d5bb9 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
@@ -200,6 +200,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
* @param string $expectedPostData
*
* @dataProvider deletePostJsonDataProvider
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function testGetDeletePostJson($id, $url, $isAjax, $expectedPostData)
{
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
index 29431583620..bad1ba8493c 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
@@ -96,6 +96,9 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Api\ExtensibleDataObjectConverter|\PHPUnit_Framework_MockObject_MockObject */
protected $extensibleDataObjectConverterMock;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
$this->addressRepositoryMock = $this->getMockForAbstractClass(
@@ -378,6 +381,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
* @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function testSaveBilling(
$data,
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Validator/PluginTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Validator/PluginTest.php
index f903d7c80ad..931d8a63bca 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Validator/PluginTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Validator/PluginTest.php
@@ -325,6 +325,7 @@ class PluginTest extends \PHPUnit_Framework_TestCase
* @param bool $isValid
* @internal param array $attributes
* @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Product
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
private function createProduct($index, $id, $isValid = true)
{
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
index f747acbc345..3db171c993e 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
@@ -125,6 +125,9 @@ class AttributePriceTest extends \PHPUnit_Framework_TestCase
$this->assertInstanceOf('Magento\ConfigurableProduct\Pricing\Price\AttributePrice', $object);
}
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function testPrepareJsonAttributes()
{
$options = [];
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
index 0a2076884d8..5aad6669d1f 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
@@ -408,6 +408,7 @@ class NameTest extends \PHPUnit_Framework_TestCase
* Helper method for testing all show*() methods.
*
* @param array $data Customer attribute(s)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
private function _setUpShowAttribute(array $data)
{
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
index 58db06e1de8..6fbbddb9bc8 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
@@ -116,6 +116,9 @@ class CreatePostTest extends \PHPUnit_Framework_TestCase
*/
protected $messageManagerMock;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
/**
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 165e730f0af..564b2ad3ac6 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
@@ -71,6 +71,7 @@ class StandardTest extends \PHPUnit_Framework_TestCase
* Data provider for testMatch
*
* @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function matchDataProvider()
{
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Message/ManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Message/ManagerTest.php
index 32e6638df24..522426d6dfe 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Message/ManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Message/ManagerTest.php
@@ -167,6 +167,9 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($messageCollection, $this->model->getMessages(true));
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
public function testAddException()
{
$exceptionMessage = 'exception message';
diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
index cd98cd9ee70..13c069e8d65 100644
--- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
+++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/Type/GroupedTest.php
@@ -283,6 +283,9 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
];
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
public function testGetChildrenMsrpWhenNoChildrenWithMsrp()
{
$key = '_cache_instance_associated_products';
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
index 9237b9f7ff8..d59754f3e00 100644
--- a/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
@@ -6,6 +6,7 @@ namespace Magento\Persistent\Block\Header;
/**
* Class AdditionalTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class AdditionalTest extends \PHPUnit_Framework_TestCase
{
@@ -85,6 +86,7 @@ class AdditionalTest extends \PHPUnit_Framework_TestCase
* Set up
*
* @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function setUp()
{
diff --git a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php
index 93ad5f6f97d..e5eaaccb1eb 100644
--- a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php
@@ -283,6 +283,7 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
* @param array $expectedValueSelectOptions
* @param array $expectedValueOption
* @dataProvider prepareValueOptionsDataProvider
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function testPrepareValueOptions(
$setData,
@@ -363,6 +364,7 @@ class AbstractProductTest extends \PHPUnit_Framework_TestCase
/**
* @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function prepareValueOptionsDataProvider()
{
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewActionTest.php b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewActionTest.php
index 027be986e7d..bd908cd6551 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewActionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewActionTest.php
@@ -6,6 +6,7 @@ namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
/**
* Class NewActionTest
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class NewActionTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
index 055e1503853..949b5e8362a 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintActionTest.php
@@ -6,6 +6,7 @@ namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
/**
* Class PrintActionTest
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class PrintActionTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/ViewTest.php b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/ViewTest.php
index f9902ddcc30..ab1bfeda56e 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/ViewTest.php
@@ -6,6 +6,7 @@ namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
/**
* Class ViewTest
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class ViewTest extends \PHPUnit_Framework_TestCase
{
@@ -89,6 +90,9 @@ class ViewTest extends \PHPUnit_Framework_TestCase
*/
protected $pageTitleMock;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function setUp()
{
$this->invoiceMock = $this->getMockBuilder('Magento\Sales\Model\Order\Invoice')
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index 80a1d4554f5..7a6214ef4f6 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -76,6 +76,9 @@ class CreateTest extends \PHPUnit_Framework_TestCase
*/
protected $objectFactory;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
$objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php
index 82b30090c84..c098b04913b 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php
@@ -74,6 +74,9 @@ class CollectTotalsTest extends \PHPUnit_Framework_TestCase
*/
protected $groupInterfaceMock;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
$this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -190,6 +193,9 @@ class CollectTotalsTest extends \PHPUnit_Framework_TestCase
$this->model->dispatch($this->observerMock);
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
public function testDispatchWithCustomerCountryNotInEUAndNotLoggedCustomerInGroup()
{
$this->groupManagementMock->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
index f99a191a3f1..f8597c45e51 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
@@ -12,6 +12,7 @@ use Magento\TestFramework\Helper\ObjectManager;
* Test class for \Magento\Sales\Model\Order
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class QuoteTest extends \PHPUnit_Framework_TestCase
{
@@ -522,6 +523,9 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
$this->assertInstanceOf('Magento\Sales\Model\Quote', $result);
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
public function testSetCustomerAddressData()
{
$customerId = 1;
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Model/UtilityTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Model/UtilityTest.php
index 3f6532d3c1f..245e5741958 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Model/UtilityTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Model/UtilityTest.php
@@ -7,6 +7,7 @@ namespace Magento\SalesRule\Model;
/**
* Class UtilityTest
*
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class UtilityTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrackTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
index b1fcb404f20..bd6a7501e36 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
@@ -155,6 +155,9 @@ class AddTrackTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function testExecute()
{
$carrier = 'carrier';
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewActionTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewActionTest.php
index 66cd7cc9e8e..f4c16404cee 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewActionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewActionTest.php
@@ -85,6 +85,9 @@ class NewActionTest extends \PHPUnit_Framework_TestCase
*/
protected $pageTitleMock;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function setUp()
{
$objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/ViewTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/ViewTest.php
index 8b07f79e1d0..312c409563c 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/ViewTest.php
@@ -6,6 +6,7 @@ namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
/**
* Class ViewTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ViewTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
index 01af7e21592..c6cd649c02d 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
@@ -121,6 +121,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
*
* @param $inputArray
* @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Api\Data\OrderTaxDetailsInterface
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function mapOrderTaxItemDetail($inputArray)
{
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index cc67af4a7cf..f684763168f 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -26,6 +26,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase
*
* @dataProvider dataProviderCollectArray
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function testCollect($itemData, $appliedRatesData, $taxDetailsData, $quoteDetailsData,
$addressData, $verifyData
diff --git a/dev/tests/unit/testsuite/Magento/Ui/Component/FilterPoolTest.php b/dev/tests/unit/testsuite/Magento/Ui/Component/FilterPoolTest.php
index 59847118f0c..108f5d5d367 100644
--- a/dev/tests/unit/testsuite/Magento/Ui/Component/FilterPoolTest.php
+++ b/dev/tests/unit/testsuite/Magento/Ui/Component/FilterPoolTest.php
@@ -147,6 +147,7 @@ class FilterPoolTest extends \PHPUnit_Framework_TestCase
* Run test prepare method
*
* @return void
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function testPrepare()
{
diff --git a/dev/tests/unit/testsuite/Magento/Ui/Component/ListingTest.php b/dev/tests/unit/testsuite/Magento/Ui/Component/ListingTest.php
index 4960983682b..a96403ced73 100644
--- a/dev/tests/unit/testsuite/Magento/Ui/Component/ListingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Ui/Component/ListingTest.php
@@ -11,6 +11,9 @@ use Magento\Ui\Component\Listing\OptionsFactory;
use Magento\Ui\Component\Listing\RowPool;
use Magento\Ui\Context\ConfigurationFactory;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class ListingTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/CartTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/CartTest.php
index 9fdcf260c80..7f1e5b216a4 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/CartTest.php
@@ -5,6 +5,10 @@
namespace Magento\Wishlist\Controller\Index;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class CartTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -87,6 +91,9 @@ class CartTest extends \PHPUnit_Framework_TestCase
*/
protected $urlMock;
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
protected function setUp()
{
$this->wishlistProviderMock = $this->getMockBuilder('Magento\Wishlist\Controller\WishlistProviderInterface')
@@ -262,6 +269,9 @@ class CartTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($this->responseMock, $this->model->execute());
}
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function testExecuteWithQuantityArray()
{
$itemId = 2;
@@ -472,6 +482,9 @@ class CartTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($this->responseMock, $this->model->execute());
}
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function testExecuteWithoutQuantityArrayAndOutOfStock()
{
$itemId = 2;
@@ -632,6 +645,9 @@ class CartTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($this->responseMock, $this->model->execute());
}
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
public function testExecuteWithoutQuantityArrayAndConfigurable()
{
$itemId = 2;
--
GitLab
From 4fc86c07f765923d84c0e935adab75cbceae5fed Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Tue, 6 Jan 2015 02:21:58 -0800
Subject: [PATCH 029/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- code in lib/internal is covered with @SuppressWarnings annotations
---
.../Magento/Framework/App/Action/Action.php | 1 +
.../Magento/Framework/Archive/Helper/File.php | 1 +
.../Magento/Framework/Archive/Tar.php | 4 ++++
.../Framework/Backup/AbstractBackup.php | 1 +
.../Framework/Backup/Filesystem/Helper.php | 3 +++
.../Backup/Filesystem/Rollback/Ftp.php | 1 +
.../Framework/Cache/Backend/Database.php | 1 +
.../Framework/Cache/Backend/Eaccelerator.php | 7 ++++++
.../Framework/Code/Reader/ArgumentsReader.php | 2 ++
.../Code/Validator/ArgumentSequence.php | 3 +++
.../Code/Validator/ConstructorIntegrity.php | 2 ++
.../Framework/Config/Composer/Package.php | 1 +
.../Magento/Framework/Config/Data.php | 3 +++
lib/internal/Magento/Framework/Config/Dom.php | 1 +
.../Framework/DB/Adapter/Pdo/Mysql.php | 22 +++++++++++++++++++
.../Magento/Framework/DB/Ddl/Table.php | 5 +++++
lib/internal/Magento/Framework/DB/Helper.php | 2 ++
lib/internal/Magento/Framework/DB/Select.php | 2 ++
.../Framework/DB/Statement/Parameter.php | 1 +
.../Framework/DB/Statement/Pdo/Mysql.php | 1 +
lib/internal/Magento/Framework/DB/Tree.php | 13 +++++++++++
.../Magento/Framework/DB/Tree/Node.php | 3 +++
.../Magento/Framework/Data/Collection.php | 3 +++
.../Magento/Framework/Data/Collection/Db.php | 1 +
.../Framework/Data/Collection/Filesystem.php | 9 ++++++++
.../Data/Form/Element/AbstractElement.php | 2 ++
.../Framework/Data/Form/Element/Checkbox.php | 2 ++
.../Framework/Data/Form/Element/Editor.php | 4 ++++
.../Framework/Data/Form/Element/Gallery.php | 2 ++
.../Framework/Data/Form/Element/Multiline.php | 1 +
.../Framework/Data/Form/Element/Time.php | 2 ++
lib/internal/Magento/Framework/Data/Tree.php | 8 +++++++
.../Magento/Framework/Data/Tree/Node.php | 1 +
lib/internal/Magento/Framework/Debug.php | 3 +++
.../Magento/Framework/Event/Observer/Cron.php | 2 ++
lib/internal/Magento/Framework/File/Csv.php | 1 +
.../Magento/Framework/File/Uploader.php | 3 +++
.../Framework/Filesystem/Driver/Http.php | 1 +
.../Magento/Framework/Filter/Input.php | 1 +
.../Framework/Filter/RemoveAccents.php | 1 +
.../Magento/Framework/Filter/Template.php | 2 ++
.../Filter/Template/Tokenizer/Parameter.php | 1 +
.../Filter/Template/Tokenizer/Variable.php | 2 ++
.../Framework/Gdata/Gshopping/Entry.php | 2 ++
.../Magento/Framework/HTTP/Adapter/Curl.php | 3 +++
.../Magento/Framework/HTTP/Client/Curl.php | 3 +++
.../Magento/Framework/HTTP/Client/Socket.php | 7 ++++++
.../Image/Adapter/AbstractAdapter.php | 2 ++
.../Magento/Framework/Image/Adapter/Gd2.php | 5 +++++
.../Framework/Image/Adapter/ImageMagick.php | 2 ++
.../Interception/Code/InterfaceValidator.php | 2 ++
.../Interception/PluginList/PluginList.php | 2 ++
.../Magento/Framework/Io/AbstractIo.php | 1 +
lib/internal/Magento/Framework/Io/File.php | 12 ++++++++++
lib/internal/Magento/Framework/Io/Ftp.php | 6 +++++
.../Magento/Framework/Io/IoInterface.php | 4 ++++
lib/internal/Magento/Framework/Io/Sftp.php | 5 +++++
.../Magento/Framework/Locale/Lists.php | 1 +
.../Framework/Message/AbstractMessage.php | 1 +
.../Magento/Framework/Message/Manager.php | 1 +
.../Framework/Message/MessageInterface.php | 1 +
.../Model/AbstractExtensibleModel.php | 1 +
.../Magento/Framework/Model/AbstractModel.php | 1 +
.../Magento/Framework/Model/Exception.php | 1 +
.../Model/Resource/Db/AbstractDb.php | 11 ++++++++++
.../Db/Collection/AbstractCollection.php | 3 +++
.../Magento/Framework/Module/DataSetup.php | 3 +++
.../Framework/Module/ModuleList/Loader.php | 1 +
lib/internal/Magento/Framework/Mview/View.php | 3 +++
lib/internal/Magento/Framework/Object.php | 1 +
.../Magento/Framework/Object/Cache.php | 5 +++++
lib/internal/Magento/Framework/Parse/Zip.php | 3 +++
.../Adapter/Mysql/Aggregation/Interval.php | 3 +++
.../Framework/Search/Dynamic/Algorithm.php | 9 ++++++++
.../Framework/Search/Request/Binder.php | 1 +
.../Framework/Search/Request/Cleaner.php | 3 +++
.../Magento/Framework/Session/Config.php | 4 ++++
.../Session/Config/ConfigInterface.php | 3 +++
.../Magento/Framework/Session/SaveHandler.php | 1 +
.../Framework/Session/SaveHandler/DbTable.php | 2 ++
.../Framework/Session/SessionManager.php | 1 +
.../Magento/Framework/Session/SidResolver.php | 2 ++
.../Session/SidResolverInterface.php | 2 ++
.../Magento/Framework/Simplexml/Config.php | 1 +
.../Magento/Framework/Simplexml/Element.php | 7 ++++++
.../Magento/Framework/Stdlib/ArrayUtils.php | 2 ++
.../Magento/Framework/Stdlib/String.php | 2 ++
.../Magento/Framework/System/Dirs.php | 4 ++++
lib/internal/Magento/Framework/System/Ftp.php | 2 ++
.../Translate/Locale/Resolver/Plugin.php | 2 ++
lib/internal/Magento/Framework/Url.php | 7 ++++++
.../Magento/Framework/UrlInterface.php | 1 +
.../Framework/View/Element/AbstractBlock.php | 1 +
.../Magento/Framework/Xml/Generator.php | 1 +
lib/internal/Magento/Framework/Xml/Parser.php | 2 ++
95 files changed, 288 insertions(+)
diff --git a/lib/internal/Magento/Framework/App/Action/Action.php b/lib/internal/Magento/Framework/App/Action/Action.php
index 8dbf0d96ebc..8e400be1281 100644
--- a/lib/internal/Magento/Framework/App/Action/Action.php
+++ b/lib/internal/Magento/Framework/App/Action/Action.php
@@ -11,6 +11,7 @@ use Magento\Framework\App\ResponseInterface;
* Default implementation of application action controller
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Action extends AbstractAction
{
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File.php b/lib/internal/Magento/Framework/Archive/Helper/File.php
index 9e8f31b9247..22c4ed76ea6 100644
--- a/lib/internal/Magento/Framework/Archive/Helper/File.php
+++ b/lib/internal/Magento/Framework/Archive/Helper/File.php
@@ -85,6 +85,7 @@ class File
* @param int $chmod
* @return void
* @throws MagentoException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function open($mode = 'w+', $chmod = 0666)
{
diff --git a/lib/internal/Magento/Framework/Archive/Tar.php b/lib/internal/Magento/Framework/Archive/Tar.php
index 05bbe624590..8aff2c0b805 100644
--- a/lib/internal/Magento/Framework/Archive/Tar.php
+++ b/lib/internal/Magento/Framework/Archive/Tar.php
@@ -310,6 +310,8 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
*
* @param bool $long
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _composeHeader($long = false)
{
@@ -379,6 +381,7 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
* @param string $destination path to file is unpacked
* @return string[] list of files
* @throws \Magento\Framework\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _unpackCurrentTar($destination)
{
@@ -514,6 +517,7 @@ class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento
* @param string $destination
* @param bool $skipRoot
* @return string
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function pack($source, $destination, $skipRoot = false)
{
diff --git a/lib/internal/Magento/Framework/Backup/AbstractBackup.php b/lib/internal/Magento/Framework/Backup/AbstractBackup.php
index 1709be0ff2c..d0f4a7812bf 100644
--- a/lib/internal/Magento/Framework/Backup/AbstractBackup.php
+++ b/lib/internal/Magento/Framework/Backup/AbstractBackup.php
@@ -215,6 +215,7 @@ abstract class AbstractBackup implements BackupInterface
* Check whether last operation completed successfully
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsSuccess()
{
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Helper.php b/lib/internal/Magento/Framework/Backup/Filesystem/Helper.php
index e944a5a5c1c..ca0a97b52fe 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Helper.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Helper.php
@@ -51,6 +51,7 @@ class Helper
* @param bool $removeRoot
* @return void
* @throws \Magento\Framework\Exception
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function rm($path, $skipPaths = [], $removeRoot = false)
{
@@ -77,6 +78,8 @@ class Helper
* @param int $infoOptions
* @param array $skipFiles
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getInfo($path, $infoOptions = self::INFO_ALL, $skipFiles = [])
{
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php
index e8f1d78766d..fef8bbba850 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php
@@ -157,6 +157,7 @@ class Ftp extends AbstractRollback
* @param string $tmpDir
* @return void
* @throws \Magento\Framework\Exception
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _uploadBackupToFtp($tmpDir)
{
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Database.php b/lib/internal/Magento/Framework/Cache/Backend/Database.php
index 8b146188d7a..ee8e1a89f33 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Database.php
@@ -498,6 +498,7 @@ class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extend
* @param string $mode
* @param string[] $tags
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _cleanByTags($mode, $tags)
{
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php b/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
index 3beab74b9d1..739b2a832ad 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
@@ -35,6 +35,7 @@ class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Ex
* @param string $id cache id
* @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
* @return string cached datas (or false)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function load($id, $doNotTestCacheValidity = false)
{
@@ -107,6 +108,7 @@ class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Ex
* @param string[] $tags array of tags
* @throws \Zend_Cache_Exception
* @return bool|void true if no problem
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
{
@@ -169,6 +171,7 @@ class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Ex
*
* @param array $tags array of tags
* @return string[] array of matching cache ids (string)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getIdsMatchingTags($tags = [])
{
@@ -183,6 +186,7 @@ class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Ex
*
* @param string[] $tags array of tags
* @return string[] array of not matching cache ids (string)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getIdsNotMatchingTags($tags = [])
{
@@ -197,6 +201,7 @@ class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Ex
*
* @param string[] $tags array of tags
* @return string[] array of any matching cache ids (string)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getIdsMatchingAnyTags($tags = [])
{
@@ -208,6 +213,7 @@ class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Ex
* Return an array of stored cache ids
*
* @return string[] array of stored cache ids (string)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getIds()
{
@@ -229,6 +235,7 @@ class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Ex
*
* @param string $id cache id
* @return array|false array of metadatas (false if the cache id is not found)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getMetadatas($id)
{
diff --git a/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
index 28309b5a591..9c57f0b7a73 100644
--- a/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
@@ -15,6 +15,8 @@ class ArgumentsReader
* @param bool $groupByPosition
* @param bool $inherited
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getConstructorArguments(\ReflectionClass $class, $groupByPosition = false, $inherited = false)
{
diff --git a/lib/internal/Magento/Framework/Code/Validator/ArgumentSequence.php b/lib/internal/Magento/Framework/Code/Validator/ArgumentSequence.php
index 2aefdb95835..d4295417196 100644
--- a/lib/internal/Magento/Framework/Code/Validator/ArgumentSequence.php
+++ b/lib/internal/Magento/Framework/Code/Validator/ArgumentSequence.php
@@ -39,6 +39,7 @@ class ArgumentSequence implements ValidatorInterface
* @param string $className
* @return bool
* @throws ValidationException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function validate($className)
{
@@ -134,6 +135,8 @@ class ArgumentSequence implements ValidatorInterface
* @param array $classArguments
* @param array $parentArguments
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _buildsSequence(array $classArguments, array $parentArguments = [])
{
diff --git a/lib/internal/Magento/Framework/Code/Validator/ConstructorIntegrity.php b/lib/internal/Magento/Framework/Code/Validator/ConstructorIntegrity.php
index 295cad1650c..e273f71abf5 100644
--- a/lib/internal/Magento/Framework/Code/Validator/ConstructorIntegrity.php
+++ b/lib/internal/Magento/Framework/Code/Validator/ConstructorIntegrity.php
@@ -29,6 +29,8 @@ class ConstructorIntegrity implements ValidatorInterface
* @param string $className
* @return bool
* @throws \Magento\Framework\Code\ValidationException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validate($className)
{
diff --git a/lib/internal/Magento/Framework/Config/Composer/Package.php b/lib/internal/Magento/Framework/Config/Composer/Package.php
index fe3079f9159..645e42a1f34 100644
--- a/lib/internal/Magento/Framework/Config/Composer/Package.php
+++ b/lib/internal/Magento/Framework/Config/Composer/Package.php
@@ -58,6 +58,7 @@ class Package
* @param string $propertyPath
* @param string $filter pattern to filter out the properties
* @return mixed
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function get($propertyPath, $filter = null)
{
diff --git a/lib/internal/Magento/Framework/Config/Data.php b/lib/internal/Magento/Framework/Config/Data.php
index 64e98788231..842e28835ba 100644
--- a/lib/internal/Magento/Framework/Config/Data.php
+++ b/lib/internal/Magento/Framework/Config/Data.php
@@ -6,6 +6,9 @@
*/
namespace Magento\Framework\Config;
+/**
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
class Data implements \Magento\Framework\Config\DataInterface
{
/**
diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
index 7ea9e21ffe5..a18c7a734a2 100644
--- a/lib/internal/Magento/Framework/Config/Dom.php
+++ b/lib/internal/Magento/Framework/Config/Dom.php
@@ -113,6 +113,7 @@ class Dom
* @param \DOMElement $node
* @param string $parentPath path to parent node
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _mergeNode(\DOMElement $node, $parentPath)
{
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index b63ca6b8f22..919699158c5 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -17,6 +17,12 @@ use Magento\Framework\DB\Statement\Parameter;
use Magento\Framework\Stdlib\DateTime;
use Magento\Framework\Stdlib\String;
+/**
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
{
const TIMESTAMP_FORMAT = 'Y-m-d H:i:s';
@@ -399,6 +405,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @param mixed $bind An array of data or data itself to bind to the placeholders.
* @return \Zend_Db_Statement_Pdo|void
* @throws \Zend_Db_Adapter_Exception To re-throw \PDOException.
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function query($sql, $bind = [])
{
@@ -650,6 +657,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
*
* @param string $sql
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _splitMultiQuery($sql)
{
@@ -1129,6 +1138,9 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
*
* @param array $tables
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function modifyTables($tables)
{
@@ -1515,6 +1527,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
*
* @param array $columnData
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getColumnCreateByDescribe($columnData)
{
@@ -1656,6 +1670,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
*
* @param array $column
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _getColumnTypeByDdl($column)
{
@@ -1752,6 +1767,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @param array $fields update fields pairs or values
* @return int The number of affected rows.
* @throws \Zend_Db_Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function insertOnDuplicate($table, array $data, array $fields = [])
{
@@ -1958,6 +1975,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @param \Magento\Framework\DB\Ddl\Table $table
* @throws \Zend_Db_Exception
* @return \Zend_Db_Pdo_Statement
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function createTemporaryTable(\Magento\Framework\DB\Ddl\Table $table)
{
@@ -2192,6 +2210,10 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @throws \Magento\Framework\Exception
* @return string
* @throws \Zend_Db_Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
protected function _getColumnDefinition($options, $ddlType = null)
{
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Table.php b/lib/internal/Magento/Framework/DB/Ddl/Table.php
index f6ac1784fa5..55b6f140a29 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/Table.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/Table.php
@@ -269,6 +269,9 @@ class Table
* @param string $comment column description
* @return $this
* @throws \Zend_Db_Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function addColumn($name, $type, $size = null, $options = [], $comment = null)
{
@@ -404,6 +407,7 @@ class Table
* @param string $onUpdate the action on update
* @return $this
* @throws \Zend_Db_Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addForeignKey($fkName, $column, $refTable, $refColumn, $onDelete = null, $onUpdate = null)
{
@@ -454,6 +458,7 @@ class Table
* @param array $options array of additional options
* @return $this
* @throws \Zend_Db_Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addIndex($indexName, $fields, $options = [])
{
diff --git a/lib/internal/Magento/Framework/DB/Helper.php b/lib/internal/Magento/Framework/DB/Helper.php
index 2b9bf573348..f0333c59a68 100644
--- a/lib/internal/Magento/Framework/DB/Helper.php
+++ b/lib/internal/Magento/Framework/DB/Helper.php
@@ -181,6 +181,8 @@ class Helper extends \Magento\Framework\DB\Helper\AbstractHelper
* @param string|null $groupByCondition OPTIONAL
* @return mixed|array
* @throws \Zend_Db_Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function prepareColumnsList(\Magento\Framework\DB\Select $select, $groupByCondition = null)
{
diff --git a/lib/internal/Magento/Framework/DB/Select.php b/lib/internal/Magento/Framework/DB/Select.php
index d94be372abb..7b30718e195 100644
--- a/lib/internal/Magento/Framework/DB/Select.php
+++ b/lib/internal/Magento/Framework/DB/Select.php
@@ -183,6 +183,8 @@ class Select extends \Zend_Db_Select
* Reset unused LEFT JOIN(s)
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function resetJoinLeft()
{
diff --git a/lib/internal/Magento/Framework/DB/Statement/Parameter.php b/lib/internal/Magento/Framework/DB/Statement/Parameter.php
index df9ef052225..7ca82cfd2b1 100644
--- a/lib/internal/Magento/Framework/DB/Statement/Parameter.php
+++ b/lib/internal/Magento/Framework/DB/Statement/Parameter.php
@@ -114,6 +114,7 @@ class Parameter
* @return bool
*
* @see setIsBlob
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsBlob()
{
diff --git a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
index 187a54490a9..1b12e7aab20 100644
--- a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
@@ -21,6 +21,7 @@ class Mysql extends \Zend_Db_Statement_Pdo
* @param array $params Array of values to bind to parameter placeholders.
* @return bool
* @throws \Zend_Db_Statement_Exception
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function _executeWithBinding(array $params)
{
diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
index a6c344ff265..c87b9bf2a29 100644
--- a/lib/internal/Magento/Framework/DB/Tree.php
+++ b/lib/internal/Magento/Framework/DB/Tree.php
@@ -76,6 +76,8 @@ class Tree
/**
* @param array $config
* @throws TreeException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function __construct($config = [])
{
@@ -273,6 +275,7 @@ class Tree
* @param string|int $nodeId
* @param array $data
* @return false|string
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function appendChild($nodeId, $data)
{
@@ -440,6 +443,10 @@ class Tree
* @param string|int $pId
* @param string|int $aId
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function moveNode($eId, $pId, $aId = 0)
{
@@ -770,6 +777,11 @@ class Tree
* @param string|int $pId
* @param string|int $aId
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function moveNodes($eId, $pId, $aId = 0)
{
@@ -990,6 +1002,7 @@ class Tree
* @param int $startLevel
* @param int $endLevel
* @return NodeSet
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
{
diff --git a/lib/internal/Magento/Framework/DB/Tree/Node.php b/lib/internal/Magento/Framework/DB/Tree/Node.php
index 7644fb58c11..b4252b7c045 100644
--- a/lib/internal/Magento/Framework/DB/Tree/Node.php
+++ b/lib/internal/Magento/Framework/DB/Tree/Node.php
@@ -6,6 +6,9 @@ namespace Magento\Framework\DB\Tree;
use Magento\Framework\DB\Tree\Node\NodeException;
+/**
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
+ */
class Node
{
/**
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index e115f4d4383..a11b01e7fff 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -166,6 +166,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
* @param string|int|array $condition
* @throws \Magento\Framework\Exception if some error in the input could be detected.
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function addFieldToFilter($field, $condition)
{
@@ -645,6 +646,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
*
* @param bool $flag
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function distinct($flag)
{
@@ -657,6 +659,7 @@ class Collection implements \IteratorAggregate, \Countable, ArrayInterface, Coll
* @param bool $printQuery
* @param bool $logQuery
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function loadData($printQuery = false, $logQuery = false)
{
diff --git a/lib/internal/Magento/Framework/Data/Collection/Db.php b/lib/internal/Magento/Framework/Data/Collection/Db.php
index a3d0b641186..d16b83b2be0 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Db.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Db.php
@@ -11,6 +11,7 @@ use Psr\Log\LoggerInterface as Logger;
/**
* Base items collection class
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Db extends \Magento\Framework\Data\Collection
{
diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
index e3ed90d6f7a..977f0157979 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
@@ -230,6 +230,8 @@ class Filesystem extends \Magento\Framework\Data\Collection
*
* @param string|array $dir
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _collectRecursive($dir)
{
@@ -432,6 +434,8 @@ class Filesystem extends \Magento\Framework\Data\Collection
*
* @param array $row
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.EvalExpression)
*/
protected function _filterRow($row)
{
@@ -473,6 +477,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
* @param callback $callback
* @param array $callbackParams
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _invokeFilter($callback, $callbackParams)
{
@@ -491,6 +496,9 @@ class Filesystem extends \Magento\Framework\Data\Collection
* @param string $type 'and' | 'or'
* @see Db::addFieldToFilter()
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function addFieldToFilter($field, $cond, $type = 'and')
{
@@ -730,6 +738,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
* @return bool
* @see addFieldToFilter()
* @see addCallbackFilter()
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function filterCallbackIsNull($field, $filterValue, $row)
{
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index 5a55c5df17f..4e1b736056e 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -13,6 +13,7 @@ use Magento\Framework\Escaper;
* Data form abstract class
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractElement extends AbstractForm
{
@@ -529,6 +530,7 @@ abstract class AbstractElement extends AbstractForm
* @param string|int|array $values
* @param bool $overwrite
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addElementValues($values, $overwrite = false)
{
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
index a0b553269c9..7d1f0fb0e9b 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
@@ -51,6 +51,7 @@ class Checkbox extends AbstractElement
/**
* @return string
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getElementHtml()
{
@@ -78,6 +79,7 @@ class Checkbox extends AbstractElement
* Return check status of checkbox
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsChecked()
{
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 6c14e5e5a2b..d8417a67d69 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -38,6 +38,7 @@ class Editor extends Textarea
/**
* @return string
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getElementHtml()
{
@@ -217,6 +218,8 @@ class Editor extends Textarea
*
* @param bool $visible Display button or not
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getPluginButtonsHtml($visible = true)
{
@@ -331,6 +334,7 @@ class Editor extends Textarea
*
* @param array $data Button params
* @return string
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getButtonHtml($data)
{
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
index f37dde95ea3..8a0c8a4a6ae 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
@@ -32,6 +32,8 @@ class Gallery extends AbstractElement
/**
* @return string
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getElementHtml()
{
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
index ce904bc722d..d505ead9bee 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
@@ -100,6 +100,7 @@ class Multiline extends AbstractElement
/**
* @return mixed
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getDefaultHtml()
{
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Time.php b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
index 5773541b4c9..98ce8886b35 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Time.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
@@ -44,6 +44,8 @@ class Time extends AbstractElement
/**
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getElementHtml()
{
diff --git a/lib/internal/Magento/Framework/Data/Tree.php b/lib/internal/Magento/Framework/Data/Tree.php
index 660df333b21..0bfad5302f7 100644
--- a/lib/internal/Magento/Framework/Data/Tree.php
+++ b/lib/internal/Magento/Framework/Data/Tree.php
@@ -45,6 +45,7 @@ class Tree
*
* @param Node $parentNode
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function load($parentNode = null)
{
@@ -55,6 +56,7 @@ class Tree
*
* @param int|string $nodeId
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function loadNode($nodeId)
{
@@ -67,6 +69,7 @@ class Tree
* @param Node $parentNode
* @param Node $prevNode
* @return Node
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function appendChild($data, $parentNode, $prevNode = null)
{
@@ -102,6 +105,7 @@ class Tree
* @param Node $parentNode
* @param Node $prevNode
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function moveNodeTo($node, $parentNode, $prevNode = null)
{
@@ -114,6 +118,7 @@ class Tree
* @param Node $parentNode
* @param Node $prevNode
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function copyNodeTo($node, $parentNode, $prevNode = null)
{
@@ -141,6 +146,7 @@ class Tree
* @param Node $parentNode
* @param Node $prevNode
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function createNode($parentNode, $prevNode = null)
{
@@ -151,6 +157,7 @@ class Tree
*
* @param Node $node
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getChild($node)
{
@@ -161,6 +168,7 @@ class Tree
*
* @param Node $node
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getChildren($node)
{
diff --git a/lib/internal/Magento/Framework/Data/Tree/Node.php b/lib/internal/Magento/Framework/Data/Tree/Node.php
index 4e4d94ee217..4cae8b6ff59 100644
--- a/lib/internal/Magento/Framework/Data/Tree/Node.php
+++ b/lib/internal/Magento/Framework/Data/Tree/Node.php
@@ -168,6 +168,7 @@ class Node extends \Magento\Framework\Object
/**
* @param Node $node
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function isChildOf($node)
{
diff --git a/lib/internal/Magento/Framework/Debug.php b/lib/internal/Magento/Framework/Debug.php
index 7d58d1bc7db..9fbac155956 100644
--- a/lib/internal/Magento/Framework/Debug.php
+++ b/lib/internal/Magento/Framework/Debug.php
@@ -60,6 +60,8 @@ class Debug
* @param bool $html output in HTML format
* @param bool $withArgs add short arguments of methods
* @return string|bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public static function trace(array $trace, $return = false, $html = true, $withArgs = true)
{
@@ -140,6 +142,7 @@ class Debug
*
* @param mixed $arg
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected static function _formatCalledArgument($arg)
{
diff --git a/lib/internal/Magento/Framework/Event/Observer/Cron.php b/lib/internal/Magento/Framework/Event/Observer/Cron.php
index c2ff3a5cf57..755b758d939 100644
--- a/lib/internal/Magento/Framework/Event/Observer/Cron.php
+++ b/lib/internal/Magento/Framework/Event/Observer/Cron.php
@@ -62,6 +62,8 @@ class Cron extends \Magento\Framework\Event\Observer
* @param string $expr
* @param int $num
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function matchCronExpression($expr, $num)
{
diff --git a/lib/internal/Magento/Framework/File/Csv.php b/lib/internal/Magento/Framework/File/Csv.php
index 9405809d963..9c5a6740780 100644
--- a/lib/internal/Magento/Framework/File/Csv.php
+++ b/lib/internal/Magento/Framework/File/Csv.php
@@ -136,6 +136,7 @@ class Csv
* @param string $delimiter
* @param string $enclosure
* @return int
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function fputcsv(&$handle, $fields = [], $delimiter = ',', $enclosure = '"')
{
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index 8eaa20cd159..45c38e41452 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -169,6 +169,7 @@ class Uploader
*
* @param array $result
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _afterSave($result)
{
@@ -183,6 +184,7 @@ class Uploader
* @param string $newFileName
* @return array
* @throws \Exception
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function save($destinationFolder, $newFileName = null)
{
@@ -486,6 +488,7 @@ class Uploader
* @param string|array $fileId
* @return void
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
private function _setUploadFileId($fileId)
{
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
index 0d5a3e1f822..a02d624ba25 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
@@ -48,6 +48,7 @@ class Http extends File
*
* @param string $path
* @return array
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function stat($path)
{
diff --git a/lib/internal/Magento/Framework/Filter/Input.php b/lib/internal/Magento/Framework/Filter/Input.php
index d59595ca1af..982a25db5cd 100644
--- a/lib/internal/Magento/Framework/Filter/Input.php
+++ b/lib/internal/Magento/Framework/Filter/Input.php
@@ -205,6 +205,7 @@ class Input implements \Zend_Filter_Interface
* @param bool $isFilterListSimple
* @return array
* @throws \Exception when filter is not found or not instance of defined instances
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _filter(array $data, &$filters = null, $isFilterListSimple = false)
{
diff --git a/lib/internal/Magento/Framework/Filter/RemoveAccents.php b/lib/internal/Magento/Framework/Filter/RemoveAccents.php
index fb5800ea4e0..588e2fc8a8a 100644
--- a/lib/internal/Magento/Framework/Filter/RemoveAccents.php
+++ b/lib/internal/Magento/Framework/Filter/RemoveAccents.php
@@ -25,6 +25,7 @@ class RemoveAccents implements \Zend_Filter_Interface
/**
* @param string $string
* @return string
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function filter($string)
{
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 27dd4b24849..54bfdbb8307 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -95,6 +95,7 @@ class Template implements \Zend_Filter_Interface
* @param string $value
* @return string
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function filter($value)
{
@@ -235,6 +236,7 @@ class Template implements \Zend_Filter_Interface
* @param string $value raw parameters
* @param string $default default value
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _getVariable($value, $default = '{no_value_defined}')
{
diff --git a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Parameter.php b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Parameter.php
index 352deaaabc2..68885e11ba0 100644
--- a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Parameter.php
+++ b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Parameter.php
@@ -35,6 +35,7 @@ class Parameter extends \Magento\Framework\Filter\Template\Tokenizer\AbstractTok
* Get string value in parameters through tokenize
*
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getValue()
{
diff --git a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
index 172bdfa3948..1bdaa7f8586 100644
--- a/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
+++ b/lib/internal/Magento/Framework/Filter/Template/Tokenizer/Variable.php
@@ -13,6 +13,7 @@ class Variable extends \Magento\Framework\Filter\Template\Tokenizer\AbstractToke
* Tokenize string and return getted variable stack path
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function tokenize()
{
@@ -58,6 +59,7 @@ class Variable extends \Magento\Framework\Filter\Template\Tokenizer\AbstractToke
* Get string value for method args
*
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getString()
{
diff --git a/lib/internal/Magento/Framework/Gdata/Gshopping/Entry.php b/lib/internal/Magento/Framework/Gdata/Gshopping/Entry.php
index ac17f30d455..e755365521c 100644
--- a/lib/internal/Magento/Framework/Gdata/Gshopping/Entry.php
+++ b/lib/internal/Magento/Framework/Gdata/Gshopping/Entry.php
@@ -77,6 +77,7 @@ class Entry extends \Zend_Gdata_Entry
*
* @param \DOMNode $child The \DOMNode to process
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function takeChildFromDOM($child)
{
@@ -222,6 +223,7 @@ class Entry extends \Zend_Gdata_Entry
*
* @param string $name The name of the Content attribute to look for
* @return string[] $matches Array of Attribute
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getContentAttributesByName($name)
{
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
index 0f6a781312f..d9702d7e330 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -50,6 +50,8 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
* Apply current configuration array to transport resource
*
* @return \Magento\Framework\HTTP\Adapter\Curl
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _applyConfig()
{
@@ -136,6 +138,7 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
* @param array $headers
* @param string $body
* @return string Request as text
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '')
{
diff --git a/lib/internal/Magento/Framework/HTTP/Client/Curl.php b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
index 88b0f8e866a..86285f63b46 100644
--- a/lib/internal/Magento/Framework/HTTP/Client/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
@@ -330,6 +330,8 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
* @param string $uri
* @param array $params
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function makeRequest($method, $uri, $params = [])
{
@@ -405,6 +407,7 @@ class Curl implements \Magento\Framework\HTTP\ClientInterface
* @param resource $ch curl handle, not needed
* @param string $data
* @return int
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function parseHeaders($ch, $data)
{
diff --git a/lib/internal/Magento/Framework/HTTP/Client/Socket.php b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
index 0c39b6870ee..ed837b4cdbb 100644
--- a/lib/internal/Magento/Framework/HTTP/Client/Socket.php
+++ b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
@@ -10,6 +10,12 @@
*/
namespace Magento\Framework\HTTP\Client;
+/**
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
+ */
+/**
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
+ */
class Socket implements \Magento\Framework\HTTP\ClientInterface
{
/**
@@ -406,6 +412,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
* Process response
*
* @return void
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function processResponse()
{
diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
index bd5b3a6cf23..9b742a37a5f 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
@@ -9,6 +9,7 @@ use Magento\Framework\App\Filesystem\DirectoryList;
/**
* @file Abstract.php
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
abstract class AbstractAdapter implements AdapterInterface
{
@@ -261,6 +262,7 @@ abstract class AbstractAdapter implements AdapterInterface
*
* @param \Magento\Framework\Filesystem $filesystem
* @param array $data
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(\Magento\Framework\Filesystem $filesystem, array $data = [])
{
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index 3895c29ecd1..3d9c02d670d 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -202,6 +202,7 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
* @param resource &$imageResourceTo
* @return int
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
private function _fillBackgroundColor(&$imageResourceTo)
{
@@ -275,6 +276,7 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
* @param bool &$isAlpha
* @param bool &$isTrueColor
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
private function _getTransparency($imageResource, $fileType, &$isAlpha = false, &$isTrueColor = false)
{
@@ -365,6 +367,9 @@ class Gd2 extends \Magento\Framework\Image\Adapter\AbstractAdapter
* @param int $opacity
* @param bool $tile
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity = 30, $tile = false)
{
diff --git a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
index 89ab022508c..867578dd8e6 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
@@ -234,6 +234,8 @@ class ImageMagick extends \Magento\Framework\Image\Adapter\AbstractAdapter
* @return void
* @throws \LogicException
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity = 30, $tile = false)
{
diff --git a/lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php b/lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php
index 3767bc54b2f..d1cd6952c61 100644
--- a/lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php
+++ b/lib/internal/Magento/Framework/Interception/Code/InterfaceValidator.php
@@ -35,6 +35,8 @@ class InterfaceValidator
*
* @return void
* @throws ValidatorException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function validate($pluginClass, $interceptedType)
{
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 655d036f1e7..083b8c3cf77 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -83,6 +83,7 @@ class PluginList extends Scoped implements InterceptionPluginList
* @param ClassDefinitions $classDefinitions
* @param array $scopePriorityScheme
* @param string $cacheId
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
ReaderInterface $reader,
@@ -112,6 +113,7 @@ class PluginList extends Scoped implements InterceptionPluginList
* @return array
* @throws InvalidArgumentException
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _inheritPlugins($type)
{
diff --git a/lib/internal/Magento/Framework/Io/AbstractIo.php b/lib/internal/Magento/Framework/Io/AbstractIo.php
index bb2fc4e0a65..b5c5626070b 100644
--- a/lib/internal/Magento/Framework/Io/AbstractIo.php
+++ b/lib/internal/Magento/Framework/Io/AbstractIo.php
@@ -52,6 +52,7 @@ abstract class AbstractIo implements IoInterface
/**
* @param string $path
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getCleanPath($path)
{
diff --git a/lib/internal/Magento/Framework/Io/File.php b/lib/internal/Magento/Framework/Io/File.php
index 375f9ee65aa..5193ec7c0e2 100644
--- a/lib/internal/Magento/Framework/Io/File.php
+++ b/lib/internal/Magento/Framework/Io/File.php
@@ -6,6 +6,7 @@ namespace Magento\Framework\Io;
/**
* Filesystem client
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
*/
class File extends AbstractIo
{
@@ -366,6 +367,8 @@ class File extends AbstractIo
* @param array $dirCallback
* @return mixed
* @throws \InvalidArgumentException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected static function _recursiveCallback($dir, array $fileCallback, array $dirCallback = [])
{
@@ -416,6 +419,7 @@ class File extends AbstractIo
* @param string $dir
* @return true
* @throws \Exception
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function cd($dir)
{
@@ -458,6 +462,7 @@ class File extends AbstractIo
* @param string|resource $src
* @param int $mode
* @return int|bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function write($filename, $src, $mode = null)
{
@@ -593,6 +598,7 @@ class File extends AbstractIo
*
* @param string $filename
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function rm($filename)
{
@@ -608,6 +614,7 @@ class File extends AbstractIo
* @param string $src
* @param string $destination
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function mv($src, $destination)
{
@@ -623,6 +630,7 @@ class File extends AbstractIo
* @param string $src
* @param string $destination
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function cp($src, $destination)
{
@@ -678,6 +686,8 @@ class File extends AbstractIo
* @param string|null $grep
* @return array
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function ls($grep = null)
{
@@ -781,6 +791,8 @@ class File extends AbstractIo
* @param int $mode
* @access protected
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _parsePermissions($mode)
{
diff --git a/lib/internal/Magento/Framework/Io/Ftp.php b/lib/internal/Magento/Framework/Io/Ftp.php
index 09f41131f28..5ab2719c966 100644
--- a/lib/internal/Magento/Framework/Io/Ftp.php
+++ b/lib/internal/Magento/Framework/Io/Ftp.php
@@ -66,6 +66,8 @@ class Ftp extends AbstractIo
* @param array $args
* @return true
* @throws IoException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function open(array $args = [])
{
@@ -183,6 +185,7 @@ class Ftp extends AbstractIo
*
* @param string $dir
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function cd($dir)
{
@@ -260,6 +263,7 @@ class Ftp extends AbstractIo
*
* @param string $filename
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function rm($filename)
{
@@ -272,6 +276,7 @@ class Ftp extends AbstractIo
* @param string $src
* @param string $dest
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function mv($src, $dest)
{
@@ -293,6 +298,7 @@ class Ftp extends AbstractIo
/**
* @param null $grep ignored parameter
* @return array
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function ls($grep = null)
{
diff --git a/lib/internal/Magento/Framework/Io/IoInterface.php b/lib/internal/Magento/Framework/Io/IoInterface.php
index dfcd25c74d5..ae2e68c3ec2 100644
--- a/lib/internal/Magento/Framework/Io/IoInterface.php
+++ b/lib/internal/Magento/Framework/Io/IoInterface.php
@@ -55,6 +55,7 @@ interface IoInterface
*
* @param string $dir
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function cd($dir);
@@ -82,6 +83,7 @@ interface IoInterface
*
* @param string $filename
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function rm($filename);
@@ -91,6 +93,7 @@ interface IoInterface
* @param string $src
* @param string $dest
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function mv($src, $dest);
@@ -108,6 +111,7 @@ interface IoInterface
*
* @param string|null $grep
* @return array
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function ls($grep = null);
diff --git a/lib/internal/Magento/Framework/Io/Sftp.php b/lib/internal/Magento/Framework/Io/Sftp.php
index 4faa38532bb..2ed666aa87b 100644
--- a/lib/internal/Magento/Framework/Io/Sftp.php
+++ b/lib/internal/Magento/Framework/Io/Sftp.php
@@ -96,6 +96,7 @@ class Sftp extends AbstractIo implements IoInterface
* @param bool $recursive
* @return bool
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function rmdir($dir, $recursive = false)
{
@@ -147,6 +148,7 @@ class Sftp extends AbstractIo implements IoInterface
*
* @param string $dir
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function cd($dir)
{
@@ -187,6 +189,7 @@ class Sftp extends AbstractIo implements IoInterface
*
* @param string $filename
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function rm($filename)
{
@@ -199,6 +202,7 @@ class Sftp extends AbstractIo implements IoInterface
* @param string $source
* @param string $destination
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function mv($source, $destination)
{
@@ -222,6 +226,7 @@ class Sftp extends AbstractIo implements IoInterface
*
* @param null $grep ignored parameter
* @return array
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function ls($grep = null)
{
diff --git a/lib/internal/Magento/Framework/Locale/Lists.php b/lib/internal/Magento/Framework/Locale/Lists.php
index 006f998a1f3..9297a08df36 100644
--- a/lib/internal/Magento/Framework/Locale/Lists.php
+++ b/lib/internal/Magento/Framework/Locale/Lists.php
@@ -62,6 +62,7 @@ class Lists implements \Magento\Framework\Locale\ListsInterface
*
* @param bool $translatedName translation flag
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _getOptionLocales($translatedName = false)
{
diff --git a/lib/internal/Magento/Framework/Message/AbstractMessage.php b/lib/internal/Magento/Framework/Message/AbstractMessage.php
index 80e744c618e..18bea563de5 100644
--- a/lib/internal/Magento/Framework/Message/AbstractMessage.php
+++ b/lib/internal/Magento/Framework/Message/AbstractMessage.php
@@ -99,6 +99,7 @@ abstract class AbstractMessage implements MessageInterface
* Getter for flag. Whether message is sticky
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsSticky()
{
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index 739cdb0dbf5..dbc10ee99da 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -9,6 +9,7 @@ use Psr\Log\LoggerInterface as Logger;
/**
* Message manager model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Manager implements ManagerInterface
{
diff --git a/lib/internal/Magento/Framework/Message/MessageInterface.php b/lib/internal/Magento/Framework/Message/MessageInterface.php
index d2dd5e8b655..9155ce504ac 100644
--- a/lib/internal/Magento/Framework/Message/MessageInterface.php
+++ b/lib/internal/Magento/Framework/Message/MessageInterface.php
@@ -78,6 +78,7 @@ interface MessageInterface
* Getter for flag. Whether message is sticky
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsSticky();
diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
index 7f403df4cd1..f5109b1202c 100644
--- a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
@@ -15,6 +15,7 @@ use Symfony\Component\DependencyInjection\Exception\LogicException;
*
* This class defines basic data structure of how custom attributes are stored in an ExtensibleModel.
* Implementations may choose to process custom attributes as their persistence requires them to.
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractExtensibleModel extends AbstractModel implements ExtensibleDataInterface
{
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index b223b53f1ce..a4da902087b 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -10,6 +10,7 @@ namespace Magento\Framework\Model;
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
abstract class AbstractModel extends \Magento\Framework\Object
{
diff --git a/lib/internal/Magento/Framework/Model/Exception.php b/lib/internal/Magento/Framework/Model/Exception.php
index 8b92e2930ee..a5af17e4545 100644
--- a/lib/internal/Magento/Framework/Model/Exception.php
+++ b/lib/internal/Magento/Framework/Model/Exception.php
@@ -8,6 +8,7 @@ namespace Magento\Framework\Model;
* Magento Model Exception
*
* This class will be extended by other modules
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Exception extends \Exception
{
diff --git a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
index 4309ef36b03..b03b19be0b6 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
@@ -9,6 +9,7 @@ use Magento\Framework\Model\Exception as ModelException;
/**
* Abstract resource model class
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractResource
{
@@ -355,6 +356,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
* @param mixed $value
* @param \Magento\Framework\Model\AbstractModel $object
* @return \Zend_Db_Select
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getLoadSelect($field, $value, $object)
{
@@ -368,6 +370,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function save(\Magento\Framework\Model\AbstractModel $object)
{
@@ -507,6 +510,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return void
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function unserializeFields(\Magento\Framework\Model\AbstractModel $object)
{
@@ -592,6 +596,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
* @param \Magento\Framework\Model\AbstractModel $object
* @return $this
* @throws ModelException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _checkUnique(\Magento\Framework\Model\AbstractModel $object)
{
@@ -654,6 +659,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
*
* @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
{
@@ -665,6 +671,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
*
* @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
{
@@ -676,6 +683,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
*
* @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
{
@@ -687,6 +695,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
*
* @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
{
@@ -698,6 +707,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
*
* @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
{
@@ -709,6 +719,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return void
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _serializeFields(\Magento\Framework\Model\AbstractModel $object)
{
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 6e68ed3552d..b82cc776430 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
@@ -6,6 +6,7 @@ namespace Magento\Framework\Model\Resource\Db\Collection;
/**
* Abstract Resource Collection
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
{
@@ -190,6 +191,8 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
* Init fields for select
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _initSelectFields()
{
diff --git a/lib/internal/Magento/Framework/Module/DataSetup.php b/lib/internal/Magento/Framework/Module/DataSetup.php
index 7612e372fa0..e01b19a57f0 100644
--- a/lib/internal/Magento/Framework/Module/DataSetup.php
+++ b/lib/internal/Magento/Framework/Module/DataSetup.php
@@ -262,6 +262,7 @@ class DataSetup extends \Magento\Framework\Module\Setup implements \Magento\Fram
* @param string $toVersion
* @param array $arrFiles
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _getModifySqlFiles($actionType, $fromVersion, $toVersion, $arrFiles)
{
@@ -383,6 +384,7 @@ class DataSetup extends \Magento\Framework\Module\Setup implements \Magento\Fram
* @param string $parentField
* @param string|integer $parentId
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function updateTableRow($table, $idField, $rowId, $field, $value = null, $parentField = null, $parentId = 0)
{
@@ -415,6 +417,7 @@ class DataSetup extends \Magento\Framework\Module\Setup implements \Magento\Fram
* Check call afterApplyAllUpdates method for setup class
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCallAfterApplyAllUpdates()
{
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
index 37274755fa6..d29b2215843 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -65,6 +65,7 @@ class Loader
*
* @param array $origList
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
private function sortBySequence($origList)
{
diff --git a/lib/internal/Magento/Framework/Mview/View.php b/lib/internal/Magento/Framework/Mview/View.php
index 2de767d6565..925bfd4a545 100644
--- a/lib/internal/Magento/Framework/Mview/View.php
+++ b/lib/internal/Magento/Framework/Mview/View.php
@@ -4,6 +4,9 @@
*/
namespace Magento\Framework\Mview;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class View extends \Magento\Framework\Object implements ViewInterface
{
/**
diff --git a/lib/internal/Magento/Framework/Object.php b/lib/internal/Magento/Framework/Object.php
index 438cdad543f..8ddf01ee696 100644
--- a/lib/internal/Magento/Framework/Object.php
+++ b/lib/internal/Magento/Framework/Object.php
@@ -8,6 +8,7 @@ namespace Magento\Framework;
* Universal data container with array access implementation
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Object implements \ArrayAccess
{
diff --git a/lib/internal/Magento/Framework/Object/Cache.php b/lib/internal/Magento/Framework/Object/Cache.php
index 8e3b78254f0..187f7fd1be9 100644
--- a/lib/internal/Magento/Framework/Object/Cache.php
+++ b/lib/internal/Magento/Framework/Object/Cache.php
@@ -122,6 +122,8 @@ class Cache
* @param array|string $tags
* @return string
* @throws \Magento\Framework\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function save($object, $idx = null, $tags = null)
{
@@ -273,6 +275,7 @@ class Cache
*
* @param array|string $tags
* @return true
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function deleteByTags($tags)
{
@@ -347,6 +350,7 @@ class Cache
*
* @param array|string $tags
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function findByTags($tags)
{
@@ -388,6 +392,7 @@ class Cache
* @param string $idx
* @param object|null $object
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function debug($idx, $object = null)
{
diff --git a/lib/internal/Magento/Framework/Parse/Zip.php b/lib/internal/Magento/Framework/Parse/Zip.php
index 9bd285f6bb0..6efc853e5b1 100644
--- a/lib/internal/Magento/Framework/Parse/Zip.php
+++ b/lib/internal/Magento/Framework/Parse/Zip.php
@@ -44,6 +44,9 @@ class Zip
*
* @param string $zipRange
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public static function zipRangeToZipPattern($zipRange)
{
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
index 101df074da7..b58f03db80c 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
@@ -40,6 +40,7 @@ class Interval implements IntervalInterface
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function load($limit, $offset = null, $lower = null, $upper = null)
{
@@ -62,6 +63,7 @@ class Interval implements IntervalInterface
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function loadPrevious($data, $index, $lower = null)
{
@@ -83,6 +85,7 @@ class Interval implements IntervalInterface
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function loadNext($data, $rightIndex, $upper = null)
{
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php
index b84ca42ca89..07a29e76052 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php
@@ -162,6 +162,8 @@ class Algorithm
*
* @param IntervalInterface $interval
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function calculateSeparators(IntervalInterface $interval)
{
@@ -258,6 +260,9 @@ class Algorithm
* @param int $quantileNumber should be from 1 to n-1 where n is number of intervals
* @param IntervalInterface $interval
* @return array|null
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _findValueSeparator($quantileNumber, IntervalInterface $interval)
{
@@ -418,6 +423,8 @@ class Algorithm
* @param bool $returnEmpty whether empty result is acceptable
* @param null|float $roundingFactor if given, checks for range to contain the factor
* @return false|array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _findRoundValue($lowerValue, $upperValue, $returnEmpty = true, $roundingFactor = null)
{
@@ -547,6 +554,8 @@ class Algorithm
* @param float $value
* @param null|float[] $limits search [from, to]
* @return int
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _binarySearch($value, $limits = null)
{
diff --git a/lib/internal/Magento/Framework/Search/Request/Binder.php b/lib/internal/Magento/Framework/Search/Request/Binder.php
index 30557bf5ca0..7d14148db84 100644
--- a/lib/internal/Magento/Framework/Search/Request/Binder.php
+++ b/lib/internal/Magento/Framework/Search/Request/Binder.php
@@ -47,6 +47,7 @@ class Binder
* @param array $data
* @param array $bindData
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
private function processDimensions($data, $bindData)
{
diff --git a/lib/internal/Magento/Framework/Search/Request/Cleaner.php b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
index c9751c42e57..e5194a12b4d 100644
--- a/lib/internal/Magento/Framework/Search/Request/Cleaner.php
+++ b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
@@ -64,6 +64,8 @@ class Cleaner
* @return void
* @throws StateException
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
private function cleanQuery($queryName)
{
@@ -129,6 +131,7 @@ class Cleaner
* @return void
* @throws StateException
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
private function cleanFilter($filterName)
{
diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php
index 33a8c2f7a62..f40ac7c0eee 100644
--- a/lib/internal/Magento/Framework/Session/Config.php
+++ b/lib/internal/Magento/Framework/Session/Config.php
@@ -109,6 +109,7 @@ class Config implements ConfigInterface
* @param DeploymentConfig $deploymentConfig
* @param string $scopeType
* @param string $lifetimePath
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function __construct(
\Magento\Framework\ValidatorFactory $validatorFactory,
@@ -405,6 +406,7 @@ class Config implements ConfigInterface
* Get session.cookie_secure
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCookieSecure()
{
@@ -427,6 +429,7 @@ class Config implements ConfigInterface
* Get session.cookie_httponly
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCookieHttpOnly()
{
@@ -449,6 +452,7 @@ class Config implements ConfigInterface
* Get session.use_cookies
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseCookies()
{
diff --git a/lib/internal/Magento/Framework/Session/Config/ConfigInterface.php b/lib/internal/Magento/Framework/Session/Config/ConfigInterface.php
index 80c170e4af7..b1e12ead5bc 100644
--- a/lib/internal/Magento/Framework/Session/Config/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Session/Config/ConfigInterface.php
@@ -134,6 +134,7 @@ interface ConfigInterface
* Get session.cookie_secure
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCookieSecure();
@@ -149,6 +150,7 @@ interface ConfigInterface
* Get session.cookie_httponly
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCookieHttpOnly();
@@ -164,6 +166,7 @@ interface ConfigInterface
* Get session.use_cookies
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseCookies();
}
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler.php b/lib/internal/Magento/Framework/Session/SaveHandler.php
index f028ae4b210..667f32f0043 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler.php
@@ -101,6 +101,7 @@ class SaveHandler implements SaveHandlerInterface
*
* @param int $maxLifetime
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function gc($maxLifetime)
{
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php b/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
index 354b3e0a776..a99e710816f 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
@@ -57,6 +57,7 @@ class DbTable extends \SessionHandler
* @param string $savePath ignored
* @param string $sessionName ignored
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function open($savePath, $sessionName)
{
@@ -144,6 +145,7 @@ class DbTable extends \SessionHandler
*
* @param int $maxLifeTime
* @return bool
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function gc($maxLifeTime)
{
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index fb4172633fe..95858ec7cd6 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -342,6 +342,7 @@ class SessionManager implements SessionManagerInterface
*
* @param string $urlHost can be host or url
* @return string {session_id_key}={session_id_encrypted}
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getSessionIdForHost($urlHost)
{
diff --git a/lib/internal/Magento/Framework/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
index 371c715ddbe..0c1b7fe9bde 100644
--- a/lib/internal/Magento/Framework/Session/SidResolver.php
+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
@@ -126,6 +126,7 @@ class SidResolver implements SidResolverInterface
* Retrieve use flag session var instead of SID for URL
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseSessionVar()
{
@@ -148,6 +149,7 @@ class SidResolver implements SidResolverInterface
* Retrieve use session in URL flag
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseSessionInUrl()
{
diff --git a/lib/internal/Magento/Framework/Session/SidResolverInterface.php b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
index 458b6dbaf18..12a1eaf4df6 100644
--- a/lib/internal/Magento/Framework/Session/SidResolverInterface.php
+++ b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
@@ -41,6 +41,7 @@ interface SidResolverInterface
* Retrieve use flag session var instead of SID for URL
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseSessionVar();
@@ -56,6 +57,7 @@ interface SidResolverInterface
* Retrieve use session in URL flag
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseSessionInUrl();
}
diff --git a/lib/internal/Magento/Framework/Simplexml/Config.php b/lib/internal/Magento/Framework/Simplexml/Config.php
index 58de8ce7a65..b257d4a3ac9 100644
--- a/lib/internal/Magento/Framework/Simplexml/Config.php
+++ b/lib/internal/Magento/Framework/Simplexml/Config.php
@@ -183,6 +183,7 @@ class Config
* Enter description here...
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCacheSaved()
{
diff --git a/lib/internal/Magento/Framework/Simplexml/Element.php b/lib/internal/Magento/Framework/Simplexml/Element.php
index 568a5dea211..e45db3a0d25 100644
--- a/lib/internal/Magento/Framework/Simplexml/Element.php
+++ b/lib/internal/Magento/Framework/Simplexml/Element.php
@@ -26,6 +26,7 @@ class Element extends \SimpleXMLElement
*
* @param \Magento\Framework\Simplexml\Element $element
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setParent($element)
{
@@ -58,6 +59,7 @@ class Element extends \SimpleXMLElement
* Enter description here...
*
* @return boolean
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function hasChildren()
{
@@ -92,6 +94,7 @@ class Element extends \SimpleXMLElement
* @todo param string $path Subset of xpath. Example: "child/grand[@attrName='attrValue']/subGrand"
* @param string $path Example: "child/grand@attrName=attrValue/subGrand" (to make it faster without regex)
* @return \Magento\Framework\Simplexml\Element
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function descend($path)
{
@@ -221,6 +224,8 @@ class Element extends \SimpleXMLElement
* @param string $filename
* @param int|boolean $level if false
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function asNiceXml($filename = '', $level = 0)
{
@@ -367,6 +372,8 @@ class Element extends \SimpleXMLElement
* @param \Magento\Framework\Simplexml\Element $source
* @param boolean $overwrite
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function extendChild($source, $overwrite = false)
{
diff --git a/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php b/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php
index 69856ef34a8..0a21e7a5360 100644
--- a/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php
+++ b/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php
@@ -55,6 +55,8 @@ class ArrayUtils
* @param string $prefix
* @param bool $forceSetAll
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function decorateArray($array, $prefix = 'decorated_', $forceSetAll = false)
{
diff --git a/lib/internal/Magento/Framework/Stdlib/String.php b/lib/internal/Magento/Framework/Stdlib/String.php
index ceadc8295d3..cdcd01b0239 100644
--- a/lib/internal/Magento/Framework/Stdlib/String.php
+++ b/lib/internal/Magento/Framework/Stdlib/String.php
@@ -65,6 +65,8 @@ class String
* @param bool $trim
* @param string $wordSeparatorRegex
* @return string[]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function split($value, $length = 1, $keepWords = false, $trim = false, $wordSeparatorRegex = '\s')
{
diff --git a/lib/internal/Magento/Framework/System/Dirs.php b/lib/internal/Magento/Framework/System/Dirs.php
index 73f7ea4648e..329d69fae51 100644
--- a/lib/internal/Magento/Framework/System/Dirs.php
+++ b/lib/internal/Magento/Framework/System/Dirs.php
@@ -9,6 +9,9 @@ class Dirs
/**
* @param string[]|string $dirname
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public static function rm($dirname)
{
@@ -90,6 +93,7 @@ class Dirs
* @param string $dest
* @return void
* @throws \Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public static function copyFileStrict($source, $dest)
{
diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php
index 901de8bc7cc..c5dd0963a71 100644
--- a/lib/internal/Magento/Framework/System/Ftp.php
+++ b/lib/internal/Magento/Framework/System/Ftp.php
@@ -332,6 +332,7 @@ class Ftp
* @param int $fileMode FTP_BINARY | FTP_ASCII
* @param int $resumeOffset
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function get($localFile, $remoteFile, $fileMode = FTP_BINARY, $resumeOffset = 0)
{
@@ -426,6 +427,7 @@ class Ftp
* @param string $dir
* @param bool $recursive
* @return array
+ * @SuppressWarnings(PHPMD.ShortMethodName)
*/
public function ls($dir = "/", $recursive = false)
{
diff --git a/lib/internal/Magento/Framework/Translate/Locale/Resolver/Plugin.php b/lib/internal/Magento/Framework/Translate/Locale/Resolver/Plugin.php
index 353b7fc01ee..d9ea8e107cd 100644
--- a/lib/internal/Magento/Framework/Translate/Locale/Resolver/Plugin.php
+++ b/lib/internal/Magento/Framework/Translate/Locale/Resolver/Plugin.php
@@ -26,6 +26,7 @@ class Plugin
* @param \Magento\Framework\Locale\ResolverInterface $subject
* @param string|null $localeCode
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterEmulate(\Magento\Framework\Locale\ResolverInterface $subject, $localeCode)
{
@@ -36,6 +37,7 @@ class Plugin
* @param \Magento\Framework\Locale\ResolverInterface $subject
* @param string|null $localeCode
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterRevert(\Magento\Framework\Locale\ResolverInterface $subject, $localeCode)
{
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
index e2eaff82e8f..7b4b6baedab 100644
--- a/lib/internal/Magento/Framework/Url.php
+++ b/lib/internal/Magento/Framework/Url.php
@@ -52,6 +52,7 @@ namespace Magento\Framework;
* - F: host_url
* - G: route_path
* - H: route_url
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
*/
class Url extends \Magento\Framework\Object implements \Magento\Framework\UrlInterface
{
@@ -158,6 +159,7 @@ class Url extends \Magento\Framework\Object implements \Magento\Framework\UrlInt
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param string $scopeType
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
@@ -229,6 +231,7 @@ class Url extends \Magento\Framework\Object implements \Magento\Framework\UrlInt
* Retrieve use session rule
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseSession()
{
@@ -425,6 +428,7 @@ class Url extends \Magento\Framework\Object implements \Magento\Framework\UrlInt
*
* @param string $data
* @return \Magento\Framework\UrlInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _setRoutePath($data)
{
@@ -505,6 +509,7 @@ class Url extends \Magento\Framework\Object implements \Magento\Framework\UrlInt
*
* @param array $routeParams
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _getRoutePath($routeParams = [])
{
@@ -762,6 +767,8 @@ class Url extends \Magento\Framework\Object implements \Magento\Framework\UrlInt
* @param string|null $routePath
* @param array|null $routeParams
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getUrl($routePath = null, $routeParams = null)
{
diff --git a/lib/internal/Magento/Framework/UrlInterface.php b/lib/internal/Magento/Framework/UrlInterface.php
index e93f69e7e00..c8a8aa866eb 100644
--- a/lib/internal/Magento/Framework/UrlInterface.php
+++ b/lib/internal/Magento/Framework/UrlInterface.php
@@ -48,6 +48,7 @@ interface UrlInterface
* Retrieve use session rule
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseSession();
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 56689fe7335..4e79e73da35 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -14,6 +14,7 @@ namespace Magento\Framework\View\Element;
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractBlock extends \Magento\Framework\Object implements BlockInterface
{
diff --git a/lib/internal/Magento/Framework/Xml/Generator.php b/lib/internal/Magento/Framework/Xml/Generator.php
index c39bbc81117..62963e355bb 100644
--- a/lib/internal/Magento/Framework/Xml/Generator.php
+++ b/lib/internal/Magento/Framework/Xml/Generator.php
@@ -67,6 +67,7 @@ class Generator
* @param array $content
* @return $this
* @throws \DOMException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function arrayToXml($content)
{
diff --git a/lib/internal/Magento/Framework/Xml/Parser.php b/lib/internal/Magento/Framework/Xml/Parser.php
index e2b960caf60..9e64428863e 100644
--- a/lib/internal/Magento/Framework/Xml/Parser.php
+++ b/lib/internal/Magento/Framework/Xml/Parser.php
@@ -69,6 +69,8 @@ class Parser
/**
* @param bool $currentNode
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _xmlToArray($currentNode = false)
{
--
GitLab
From 325be96bf87db317600cd70914ea73ad781563d5 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Tue, 6 Jan 2015 02:24:41 -0800
Subject: [PATCH 030/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- app/code is covered with @SuppressWarnings annotations
---
.../AdminNotification/Model/Observer.php | 1 +
.../Model/Resource/Inbox.php | 2 ++
.../Authorization/Model/Acl/AclRetriever.php | 1 +
app/code/Magento/Backend/App/Action.php | 3 +++
.../Magento/Backend/App/Action/Context.php | 3 +++
app/code/Magento/Backend/App/DefaultPath.php | 1 +
.../Magento/Backend/Block/Dashboard/Graph.php | 4 ++++
.../Backend/Block/Dashboard/Orders/Grid.php | 1 +
.../Block/Dashboard/Tab/Customers/Most.php | 1 +
.../Block/Dashboard/Tab/Customers/Newest.php | 1 +
.../Block/Dashboard/Tab/Products/Ordered.php | 1 +
.../Block/Dashboard/Tab/Products/Viewed.php | 1 +
.../Block/System/Config/Form/Field.php | 1 +
.../Block/Widget/Button/ButtonList.php | 1 +
.../Backend/Block/Widget/Form/Container.php | 1 +
.../Magento/Backend/Block/Widget/Grid.php | 6 ++++++
.../Backend/Block/Widget/Grid/Column.php | 1 +
.../Block/Widget/Grid/Column/Filter/Store.php | 2 ++
.../Grid/Column/Renderer/AbstractRenderer.php | 1 +
.../Widget/Grid/Column/Renderer/Action.php | 2 ++
.../Widget/Grid/Column/Renderer/Checkbox.php | 2 ++
.../Widget/Grid/Column/Renderer/Options.php | 1 +
.../Widget/Grid/Column/Renderer/Store.php | 5 +++++
.../Backend/Block/Widget/Grid/ColumnSet.php | 4 ++++
.../Backend/Block/Widget/Grid/Container.php | 1 +
.../Backend/Block/Widget/Grid/Export.php | 1 +
.../Backend/Block/Widget/Grid/Extended.php | 10 +++++++++
.../Grid/Massaction/AbstractMassaction.php | 1 +
.../Block/Widget/Grid/Massaction/Extended.php | 1 +
.../Magento/Backend/Block/Widget/Tabs.php | 4 ++++
.../System/Config/System/Storage/Status.php | 1 +
.../Adminhtml/System/Store/EditStore.php | 2 ++
.../Adminhtml/System/Store/Save.php | 1 +
.../Magento/Backend/Model/Auth/Session.php | 1 +
app/code/Magento/Backend/Model/Config.php | 4 ++++
.../Model/Config/Structure/Converter.php | 2 ++
.../Magento/Backend/Model/Locale/Resolver.php | 1 +
.../Magento/Backend/Model/Menu/Config.php | 3 +++
.../Magento/Backend/Model/Session/Quote.php | 2 ++
.../Controller/Adminhtml/Index/Create.php | 1 +
.../Controller/Adminhtml/Index/Download.php | 1 +
.../Controller/Adminhtml/Index/Rollback.php | 3 +++
app/code/Magento/Backup/Model/Backup.php | 1 +
app/code/Magento/Backup/Model/Resource/Db.php | 1 +
.../Magento/Backup/Model/Resource/Helper.php | 1 +
.../Magento/Bundle/Api/Data/LinkInterface.php | 1 +
.../Catalog/Product/Edit/Tab/Attributes.php | 3 +++
.../Product/Edit/Tab/Attributes/Extend.php | 3 +++
.../Adminhtml/Sales/Order/Items/Renderer.php | 2 ++
.../Sales/Order/View/Items/Renderer.php | 2 ++
.../Product/View/Type/Bundle/Option.php | 1 +
.../Block/Checkout/Cart/Item/Renderer.php | 2 ++
.../Block/Sales/Order/Items/Renderer.php | 2 ++
.../Initialization/Helper/Plugin/Bundle.php | 1 +
.../Magento/Bundle/Model/LinkManagement.php | 5 +++++
app/code/Magento/Bundle/Model/Observer.php | 2 ++
.../Magento/Bundle/Model/OptionRepository.php | 5 +++++
.../Magento/Bundle/Model/Product/Price.php | 7 +++++++
.../Magento/Bundle/Model/Product/Type.php | 11 ++++++++++
.../Bundle/Model/Resource/Indexer/Price.php | 2 ++
.../Sales/Order/Pdf/Items/AbstractItems.php | 4 ++++
.../Sales/Order/Pdf/Items/Creditmemo.php | 3 +++
.../Model/Sales/Order/Pdf/Items/Invoice.php | 3 +++
.../Model/Sales/Order/Pdf/Items/Shipment.php | 3 +++
.../Bundle/Pricing/Adjustment/Calculator.php | 5 +++++
.../Pricing/Price/BundleSelectionPrice.php | 1 +
app/code/Magento/Captcha/Model/Observer.php | 1 +
.../Api/Data/CategoryTreeInterface.php | 1 +
...uctAttributeMediaGalleryEntryInterface.php | 1 +
.../Api/Data/ProductCustomOptionInterface.php | 1 +
.../Adminhtml/Category/AbstractCategory.php | 1 +
.../Adminhtml/Category/Checkboxes/Tree.php | 1 +
.../Adminhtml/Category/Tab/Attributes.php | 2 ++
.../Block/Adminhtml/Category/Tab/Design.php | 3 +++
.../Catalog/Block/Adminhtml/Category/Tabs.php | 1 +
.../Catalog/Block/Adminhtml/Category/Tree.php | 3 +++
.../Form/Renderer/Config/DateFieldsOrder.php | 1 +
.../Block/Adminhtml/Helper/Form/Wysiwyg.php | 1 +
.../Product/Attribute/Edit/Tab/Advanced.php | 1 +
.../Product/Attribute/Edit/Tab/Front.php | 1 +
.../Product/Attribute/Edit/Tab/Main.php | 4 ++++
.../Adminhtml/Product/Attribute/Grid.php | 3 +++
.../NewAttribute/Product/Attributes.php | 3 +++
.../Adminhtml/Product/Attribute/Set/Main.php | 1 +
.../Edit/Action/Attribute/Tab/Attributes.php | 3 +++
.../Adminhtml/Product/Edit/Tab/Attributes.php | 6 ++++++
.../Adminhtml/Product/Edit/Tab/Crosssell.php | 4 ++++
.../Product/Edit/Tab/Options/Option.php | 3 +++
.../Product/Edit/Tab/Options/Popup/Grid.php | 3 +++
.../Adminhtml/Product/Edit/Tab/Price/Tier.php | 1 +
.../Adminhtml/Product/Edit/Tab/Related.php | 1 +
.../Adminhtml/Product/Edit/Tab/Upsell.php | 1 +
.../Block/Adminhtml/Product/Edit/Tabs.php | 4 ++++
.../Product/Frontend/Product/Watermark.php | 2 ++
.../Catalog/Block/Adminhtml/Product/Grid.php | 1 +
.../Adminhtml/Product/Helper/Form/Gallery.php | 1 +
app/code/Magento/Catalog/Block/Navigation.php | 4 ++++
.../Catalog/Block/Product/AbstractProduct.php | 3 +++
.../Block/Product/Compare/ListCompare.php | 1 +
.../Magento/Catalog/Block/Product/Context.php | 1 +
.../Catalog/Block/Product/ListProduct.php | 1 +
.../Block/Product/ProductList/Toolbar.php | 1 +
.../Magento/Catalog/Block/Product/View.php | 1 +
.../Catalog/Block/Product/View/Attributes.php | 1 +
.../Product/View/Options/Type/Select.php | 3 +++
.../Block/Product/Widget/Html/Pager.php | 1 +
.../Block/Product/Widget/NewWidget.php | 1 +
.../Magento/Catalog/Block/Rss/Category.php | 2 ++
.../Catalog/Block/Rss/Product/Special.php | 1 +
.../Magento/Catalog/Block/Widget/Link.php | 1 +
.../Controller/Adminhtml/Category/Edit.php | 2 ++
.../Controller/Adminhtml/Category/Save.php | 3 +++
.../Catalog/Controller/Adminhtml/Product.php | 1 +
.../Product/Action/Attribute/Save.php | 4 ++++
.../Adminhtml/Product/Attribute/Edit.php | 1 +
.../Adminhtml/Product/Attribute/Save.php | 7 +++++++
.../Product/Initialization/Helper.php | 2 ++
.../Initialization/StockDataFilter.php | 1 +
.../Controller/Adminhtml/Product/Save.php | 1 +
.../Controller/Adminhtml/Product/Set/Save.php | 1 +
.../Controller/Adminhtml/Product/Validate.php | 2 ++
.../Catalog/Controller/Category/View.php | 5 +++++
.../Catalog/Controller/Product/Compare.php | 2 ++
.../Controller/Product/Compare/Index.php | 3 +++
app/code/Magento/Catalog/Helper/Data.php | 5 +++++
app/code/Magento/Catalog/Helper/Image.php | 2 ++
app/code/Magento/Catalog/Helper/Output.php | 1 +
app/code/Magento/Catalog/Helper/Product.php | 7 +++++++
.../Catalog/Helper/Product/Compare.php | 3 +++
.../Catalog/Helper/Product/Composite.php | 1 +
.../Catalog/Helper/Product/Configuration.php | 2 ++
.../Helper/Product/Edit/Action/Attribute.php | 2 ++
.../Catalog/Helper/Product/Flat/Indexer.php | 3 +++
.../Magento/Catalog/Helper/Product/View.php | 2 ++
.../Magento/Catalog/Model/AbstractModel.php | 1 +
.../Model/App/Action/ContextPlugin.php | 1 +
app/code/Magento/Catalog/Model/Category.php | 8 +++++++
.../Category/Attribute/Backend/Sortby.php | 2 ++
app/code/Magento/Catalog/Model/Config.php | 2 ++
.../Catalog/Model/Entity/Attribute.php | 2 ++
.../Model/Indexer/Category/AffectCache.php | 1 +
.../Indexer/Category/Flat/AbstractAction.php | 1 +
.../Category/Product/Plugin/StoreGroup.php | 1 +
.../Model/Indexer/Product/AffectCache.php | 1 +
.../Indexer/Product/Flat/AbstractAction.php | 2 ++
.../Indexer/Product/Flat/Action/Indexer.php | 2 ++
.../Indexer/Product/Flat/FlatTableBuilder.php | 2 ++
.../Indexer/Product/Price/AbstractAction.php | 2 ++
app/code/Magento/Catalog/Model/Layer.php | 1 +
.../Model/Layer/Filter/Dynamic/Auto.php | 3 +++
.../Catalog/Model/Layer/Filter/Price.php | 2 ++
app/code/Magento/Catalog/Model/Product.php | 8 +++++++
.../Magento/Catalog/Model/Product/Action.php | 1 +
.../Backend/Groupprice/AbstractGroupprice.php | 6 ++++++
.../Model/Product/Attribute/Backend/Media.php | 10 +++++++++
.../Model/Product/Attribute/Backend/Price.php | 1 +
.../Model/Product/Attribute/Repository.php | 6 ++++++
.../Product/Attribute/Source/Inputtype.php | 1 +
.../Catalog/Model/Product/Compare/Item.php | 1 +
.../Catalog/Model/Product/Gallery/Entry.php | 1 +
.../Product/Gallery/GalleryManagement.php | 3 +++
.../Model/Product/GroupPriceManagement.php | 2 ++
.../Magento/Catalog/Model/Product/Image.php | 11 ++++++++++
.../Magento/Catalog/Model/Product/Option.php | 4 ++++
.../Model/Product/Option/Type/Date.php | 5 +++++
.../Model/Product/Option/Type/DefaultType.php | 5 +++++
.../Model/Product/Option/Type/File.php | 2 ++
.../Option/Type/File/ValidatorFile.php | 4 ++++
.../Model/Product/Option/Validator/Select.php | 2 ++
.../Catalog/Model/Product/PriceModifier.php | 1 +
.../Model/Product/TierPriceManagement.php | 3 +++
.../Model/Product/Type/AbstractType.php | 21 +++++++++++++++++++
.../Catalog/Model/Product/Type/Price.php | 4 ++++
.../Magento/Catalog/Model/Product/Url.php | 2 ++
.../Catalog/Model/Product/Validator.php | 1 +
.../Catalog/Model/ProductRepository.php | 3 +++
.../Model/Resource/AbstractResource.php | 4 ++++
.../Catalog/Model/Resource/Category.php | 5 +++++
.../Model/Resource/Category/Collection.php | 2 ++
.../Catalog/Model/Resource/Category/Tree.php | 8 +++++++
.../Catalog/Model/Resource/Eav/Attribute.php | 5 +++++
.../Magento/Catalog/Model/Resource/Helper.php | 1 +
.../Catalog/Model/Resource/Product.php | 2 ++
.../Model/Resource/Product/Collection.php | 13 ++++++++++++
.../Product/Compare/Item/Collection.php | 1 +
.../Product/Indexer/Price/DefaultPrice.php | 3 +++
.../Catalog/Model/Resource/Product/Link.php | 1 +
.../Catalog/Model/Resource/Product/Option.php | 3 +++
.../Model/Resource/Product/Option/Value.php | 3 +++
.../Product/Option/Value/Collection.php | 1 +
.../Magento/Catalog/Model/Resource/Setup.php | 1 +
.../Magento/Catalog/Model/Resource/Url.php | 2 ++
.../Backend/Catalog/Url/Rewrite/Suffix.php | 4 ++++
.../Catalog/Pricing/Price/TierPrice.php | 1 +
.../Catalog/Pricing/Render/PriceBox.php | 1 +
.../Model/Export/Product.php | 8 +++++++
.../Model/Import/Product.php | 18 ++++++++++++++++
.../Model/Import/Product/Option.php | 2 ++
.../Import/Product/Type/AbstractType.php | 5 +++++
.../Api/Data/StockItemInterface.php | 12 +++++++++++
.../Api/StockConfigurationInterface.php | 2 ++
.../Magento/CatalogInventory/Helper/Stock.php | 1 +
.../Model/Adminhtml/Stock/Item.php | 2 ++
.../CatalogInventory/Model/Configuration.php | 2 ++
.../CatalogInventory/Model/Observer.php | 1 +
.../Model/Quote/Item/QuantityValidator.php | 3 +++
.../Initializer/StockItem.php | 2 ++
.../Resource/Indexer/Stock/DefaultStock.php | 2 ++
.../CatalogInventory/Model/Stock/Item.php | 15 +++++++++++++
.../Model/Stock/StockItemRepository.php | 2 ++
.../Model/Stock/StockRepository.php | 1 +
.../Model/Stock/StockStatusRepository.php | 1 +
.../CatalogInventory/Model/StockIndex.php | 2 ++
.../Model/StockManagement.php | 1 +
.../Model/StockRegistryProvider.php | 1 +
.../Model/StockStateProvider.php | 5 +++++
.../Promo/Catalog/Edit/Tab/Actions.php | 1 +
.../Adminhtml/Promo/Catalog/Edit/Tab/Main.php | 1 +
.../Adminhtml/Promo/Catalog/Save.php | 1 +
.../Model/Indexer/IndexBuilder.php | 10 +++++++++
.../Magento/CatalogRule/Model/Observer.php | 3 +++
.../CatalogRule/Model/Resource/Rule.php | 1 +
app/code/Magento/CatalogRule/Model/Rule.php | 4 ++++
.../Mysql/Aggregation/DataProvider.php | 3 +++
.../Adapter/Mysql/Dynamic/DataProvider.php | 3 +++
.../Adapter/Mysql/Filter/Preprocessor.php | 1 +
.../Magento/CatalogSearch/Model/Advanced.php | 6 ++++++
.../Model/Indexer/Fulltext/Action/Full.php | 9 ++++++++
.../Model/Layer/Filter/Decimal.php | 1 +
.../Model/Layer/Filter/Price.php | 2 ++
.../CatalogSearch/Model/Resource/Advanced.php | 3 +++
.../Model/Resource/Advanced/Collection.php | 2 ++
.../Model/Resource/Fulltext/Collection.php | 1 +
.../Model/Resource/Search/Collection.php | 3 +++
.../Model/Search/RequestGenerator.php | 1 +
.../Block/Product/ProductsList.php | 2 ++
.../Model/Rule/Condition/Product.php | 1 +
app/code/Magento/Centinel/Model/Config.php | 2 ++
app/code/Magento/Centinel/Model/Service.php | 1 +
.../Centinel/Model/State/Mastercard.php | 3 +++
.../Magento/Centinel/Model/State/Visa.php | 4 ++++
app/code/Magento/Checkout/Block/Cart.php | 2 ++
.../Checkout/Block/Cart/Item/Renderer.php | 1 +
.../Magento/Checkout/Block/Cart/Shipping.php | 2 ++
.../Magento/Checkout/Block/Cart/Sidebar.php | 2 ++
app/code/Magento/Checkout/Block/Onepage.php | 1 +
.../Block/Onepage/AbstractOnepage.php | 2 ++
.../Checkout/Block/Onepage/Billing.php | 2 ++
.../Magento/Checkout/Block/Onepage/Login.php | 2 ++
.../Checkout/Block/Onepage/Shipping.php | 2 ++
.../Onepage/Shipping/Method/Available.php | 2 ++
.../Magento/Checkout/Block/Total/Nominal.php | 1 +
.../Magento/Checkout/Controller/Cart/Add.php | 1 +
.../Checkout/Controller/Cart/CouponPost.php | 2 ++
.../Controller/Cart/UpdateItemOptions.php | 2 ++
.../Magento/Checkout/Controller/Onepage.php | 4 ++++
.../Checkout/Controller/Onepage/SaveOrder.php | 2 ++
.../Controller/Onepage/SavePayment.php | 1 +
app/code/Magento/Checkout/Helper/Cart.php | 2 ++
app/code/Magento/Checkout/Helper/Data.php | 3 +++
app/code/Magento/Checkout/Model/Cart.php | 6 ++++++
app/code/Magento/Checkout/Model/Session.php | 6 ++++++
.../Magento/Checkout/Model/Type/Onepage.php | 13 ++++++++++++
.../Checkout/Service/V1/Cart/ReadService.php | 1 +
.../Service/V1/Data/Cart/Customer.php | 1 +
.../Service/V1/Data/Cart/ShippingMethod.php | 1 +
.../Checkout/Service/V1/Data/CartMapper.php | 1 +
.../Block/Adminhtml/Agreement/Edit/Form.php | 1 +
.../Block/Adminhtml/Agreement/Grid.php | 1 +
.../Controller/Adminhtml/Agreement/Edit.php | 1 +
.../Block/Adminhtml/Page/Edit/Tab/Main.php | 1 +
.../Magento/Cms/Block/Adminhtml/Page/Grid.php | 1 +
.../Cms/Controller/Adminhtml/Block/Edit.php | 1 +
.../Cms/Controller/Adminhtml/Page/Edit.php | 1 +
.../Magento/Cms/Controller/Index/Index.php | 1 +
app/code/Magento/Cms/Helper/Page.php | 3 +++
app/code/Magento/Cms/Model/Resource/Block.php | 1 +
.../Cms/Model/Resource/CmsCriteriaMapper.php | 1 +
.../Cms/Model/Wysiwyg/Images/Storage.php | 4 ++++
.../Attribute/Edit/Tab/Variations/Main.php | 3 +++
app/code/Magento/Core/App/Router/Base.php | 9 ++++++++
app/code/Magento/Core/Model/File/Storage.php | 4 ++++
.../Core/Model/File/Storage/Database.php | 1 +
.../Model/File/Storage/Directory/Database.php | 1 +
.../Magento/Core/Model/File/Storage/File.php | 1 +
.../Magento/Core/Model/File/Storage/Flag.php | 1 +
.../Model/File/Validator/AvailablePath.php | 3 +++
app/code/Magento/Core/Model/Layout/Merge.php | 3 +++
app/code/Magento/Core/Model/Observer.php | 1 +
.../Magento/Core/Model/Resource/Design.php | 2 ++
.../Core/Model/Url/RouteParamsResolver.php | 2 ++
.../Backend/Config/Structure/Converter.php | 1 +
app/code/Magento/Cron/Model/Observer.php | 6 ++++++
app/code/Magento/Cron/Model/Schedule.php | 2 ++
.../Model/System/Currencysymbol.php | 2 ++
.../Block/Adminhtml/Edit/Tab/Addresses.php | 1 +
.../Block/Adminhtml/Edit/Tab/Reviews.php | 3 +++
app/code/Magento/Customer/Helper/Address.php | 1 +
app/code/Magento/Customer/Model/Address.php | 2 ++
.../Model/Address/AbstractAddress.php | 5 +++++
.../Model/App/Action/ContextPlugin.php | 1 +
app/code/Magento/Customer/Model/Customer.php | 7 +++++++
app/code/Magento/Customer/Model/Group.php | 1 +
.../Model/Metadata/Form/AbstractData.php | 6 ++++++
.../Customer/Model/Metadata/Form/Date.php | 2 ++
.../Customer/Model/Metadata/Form/File.php | 7 +++++++
.../Customer/Model/Metadata/Form/Image.php | 2 ++
.../Model/Metadata/Form/Multiline.php | 1 +
.../Customer/Model/Metadata/Form/Text.php | 2 ++
app/code/Magento/Customer/Model/Observer.php | 1 +
.../Customer/Model/Renderer/Region.php | 2 ++
.../Model/Resource/AddressRepository.php | 3 +++
.../Customer/Model/Resource/Customer.php | 3 +++
.../Model/Resource/CustomerRepository.php | 3 +++
.../Magento/Customer/Model/Resource/Setup.php | 3 +++
app/code/Magento/Customer/Model/Session.php | 2 ++
.../Model/Export/Address.php | 4 ++++
.../Model/Import/AbstractCustomer.php | 2 ++
.../Model/Import/Address.php | 10 +++++++++
.../Model/Import/Customer.php | 9 ++++++++
.../Adminhtml/Editor/Toolbar/Buttons/Edit.php | 1 +
.../Adminhtml/Editor/Toolbar/Buttons/Save.php | 1 +
.../Magento/DesignEditor/Model/Observer.php | 1 +
.../DesignEditor/Model/Url/NavigationMode.php | 1 +
app/code/Magento/Dhl/Model/Carrier.php | 20 ++++++++++++++++++
app/code/Magento/Directory/Model/Currency.php | 4 ++++
app/code/Magento/Directory/Model/Observer.php | 1 +
.../Model/Resource/Country/Collection.php | 1 +
.../Directory/Model/Resource/Currency.php | 1 +
.../Product/Edit/Tab/Downloadable/Links.php | 6 ++++++
.../Product/Edit/Tab/Downloadable/Samples.php | 1 +
.../Block/Catalog/Product/Links.php | 4 ++++
.../Block/Catalog/Product/Samples.php | 1 +
.../Block/Checkout/Cart/Item/Renderer.php | 1 +
.../Downloadable/Block/Checkout/Success.php | 1 +
.../Block/Customer/Products/ListProducts.php | 1 +
.../Downloadable/Controller/Download/Link.php | 4 ++++
.../Controller/Download/LinkSample.php | 1 +
.../Controller/Download/Sample.php | 1 +
app/code/Magento/Downloadable/Helper/Data.php | 1 +
.../Magento/Downloadable/Helper/Download.php | 2 ++
.../Magento/Downloadable/Model/Observer.php | 5 +++++
.../Downloadable/Model/Product/Type.php | 8 +++++++
.../Downloadable/Model/Resource/Link.php | 1 +
.../Sales/Order/Pdf/Items/AbstractItems.php | 2 ++
.../Sales/Order/Pdf/Items/Creditmemo.php | 1 +
.../Model/Sales/Order/Pdf/Items/Invoice.php | 2 ++
.../Eav/Api/Data/AttributeInterface.php | 1 +
.../Attribute/Edit/Main/AbstractMain.php | 1 +
.../Eav/Model/Attribute/Data/AbstractData.php | 4 ++++
.../Magento/Eav/Model/Attribute/Data/Date.php | 2 ++
.../Magento/Eav/Model/Attribute/Data/File.php | 4 ++++
.../Eav/Model/Attribute/Data/Image.php | 2 ++
.../Magento/Eav/Model/Attribute/Data/Text.php | 2 ++
.../Magento/Eav/Model/AttributeRepository.php | 3 +++
.../Eav/Model/AttributeSetRepository.php | 3 +++
app/code/Magento/Eav/Model/Config.php | 5 +++++
.../Eav/Model/Entity/AbstractEntity.php | 18 ++++++++++++++++
.../Magento/Eav/Model/Entity/Attribute.php | 6 ++++++
.../Entity/Attribute/AbstractAttribute.php | 8 +++++++
.../Attribute/Backend/AbstractBackend.php | 2 ++
.../Eav/Model/Entity/Attribute/Set.php | 7 +++++++
.../Attribute/Source/AbstractSource.php | 3 +++
.../Entity/Collection/AbstractCollection.php | 12 +++++++++++
app/code/Magento/Eav/Model/Entity/Setup.php | 6 ++++++
.../Eav/Model/Entity/Setup/Context.php | 1 +
app/code/Magento/Eav/Model/Form.php | 3 +++
.../Magento/Eav/Model/Resource/Attribute.php | 1 +
.../Eav/Model/Resource/Entity/Attribute.php | 1 +
.../Eav/Model/Resource/Form/Fieldset.php | 2 ++
app/code/Magento/Fedex/Model/Carrier.php | 14 +++++++++++++
.../GiftMessage/Block/Message/Inline.php | 2 ++
.../Magento/GiftMessage/Helper/Message.php | 5 +++++
.../GiftMessage/Model/GiftMessageManager.php | 1 +
app/code/Magento/GiftMessage/Model/Save.php | 2 ++
.../Category/Edit/Tab/Googleoptimizer.php | 3 +++
.../Block/Adminhtml/Types/Edit/Form.php | 1 +
.../Adminhtml/Googleshopping/Types/Save.php | 1 +
.../Magento/GoogleShopping/Helper/Data.php | 1 +
.../GoogleShopping/Model/Attribute.php | 1 +
.../Model/Attribute/ContentLanguage.php | 1 +
.../Model/Attribute/DefaultAttribute.php | 3 +++
.../Model/Attribute/Destinations.php | 1 +
.../Model/Attribute/GoogleProductCategory.php | 1 +
.../Model/Attribute/ImageLink.php | 1 +
.../GoogleShopping/Model/Attribute/Link.php | 1 +
.../Model/Attribute/ProductType.php | 1 +
.../Attribute/SalePriceEffectiveDate.php | 2 ++
.../Model/Attribute/TargetCountry.php | 1 +
.../GoogleShopping/Model/Attribute/Tax.php | 2 ++
.../Magento/GoogleShopping/Model/Config.php | 3 +++
.../GoogleShopping/Model/MassOperations.php | 6 ++++++
.../Magento/GoogleShopping/Model/Observer.php | 1 +
.../Model/Resource/Attribute/Collection.php | 1 +
.../Magento/GoogleShopping/Model/Type.php | 2 ++
.../Block/Adminhtml/Export/Filter.php | 2 ++
.../Model/Export/AbstractEntity.php | 2 ++
.../Model/Export/Adapter/AbstractAdapter.php | 1 +
.../Model/Export/Entity/AbstractEav.php | 2 ++
.../Model/Export/Entity/AbstractEntity.php | 3 +++
.../Magento/ImportExport/Model/Import.php | 2 ++
.../Model/Import/AbstractEntity.php | 6 ++++++
.../Model/Import/Entity/AbstractEav.php | 2 ++
.../Model/Import/Entity/AbstractEntity.php | 5 +++++
.../Model/Processor/InvalidateCache.php | 1 +
app/code/Magento/Log/Model/Aggregation.php | 3 +++
app/code/Magento/Log/Model/Cron.php | 1 +
app/code/Magento/Log/Model/Resource/Log.php | 1 +
.../Log/Model/Resource/Visitor/Collection.php | 1 +
.../Log/Model/Resource/Visitor/Online.php | 1 +
app/code/Magento/Log/Model/Visitor.php | 1 +
.../Multishipping/Block/Checkout/Overview.php | 1 +
.../Multishipping/Controller/Checkout.php | 3 +++
.../Controller/Checkout/OverviewPost.php | 1 +
.../Model/Checkout/Type/Multishipping.php | 9 ++++++++
.../Checkout/Type/Multishipping/State.php | 1 +
.../Newsletter/Block/Adminhtml/Problem.php | 2 ++
.../Newsletter/Block/Adminhtml/Queue/Edit.php | 5 +++++
.../Block/Adminhtml/Queue/Edit/Form.php | 3 +++
.../Block/Adminhtml/Queue/Preview/Form.php | 1 +
.../Block/Adminhtml/Template/Edit.php | 3 +++
.../Block/Adminhtml/Template/Edit/Form.php | 2 ++
.../Block/Adminhtml/Template/Preview/Form.php | 1 +
.../Controller/Adminhtml/Queue/Save.php | 1 +
app/code/Magento/Newsletter/Model/Queue.php | 4 ++++
.../Model/Resource/Subscriber/Collection.php | 1 +
.../Magento/Newsletter/Model/Subscriber.php | 1 +
.../Magento/Newsletter/Model/Template.php | 3 +++
.../Model/Carrier/Flatrate.php | 2 ++
.../OfflineShipping/Model/Carrier/Pickup.php | 1 +
.../Model/Carrier/Tablerate.php | 4 ++++
.../Model/Quote/Freeshipping.php | 1 +
.../Model/Resource/Carrier/Tablerate.php | 8 +++++++
.../App/FrontController/BuiltinPlugin.php | 1 +
.../App/FrontController/VarnishPlugin.php | 1 +
.../Model/Controller/Result/BuiltinPlugin.php | 1 +
app/code/Magento/Payment/Block/Form/Cc.php | 1 +
app/code/Magento/Payment/Block/Info.php | 1 +
app/code/Magento/Payment/Helper/Data.php | 3 +++
.../Payment/Model/Method/AbstractMethod.php | 12 +++++++++++
app/code/Magento/Persistent/Helper/Data.php | 2 ++
.../Model/Observer/ClearExpiredCronJob.php | 1 +
.../Observer/CustomerAuthenticatedEvent.php | 1 +
.../Persistent/Model/Observer/Session.php | 1 +
.../Model/Observer/SetLoadPersistentQuote.php | 1 +
app/code/Magento/Persistent/Model/Session.php | 2 ++
app/code/Magento/ProductAlert/Model/Email.php | 4 ++++
.../Magento/ProductAlert/Model/Observer.php | 6 ++++++
.../Model/Resource/AbstractResource.php | 1 +
.../Adminhtml/Config/Form/Field/YtdStart.php | 1 +
.../Reports/Block/Adminhtml/Filter/Form.php | 1 +
.../Magento/Reports/Block/Adminhtml/Grid.php | 4 ++++
.../Block/Adminhtml/Grid/AbstractGrid.php | 3 +++
.../Block/Adminhtml/Product/Viewed/Grid.php | 1 +
.../Adminhtml/Sales/Bestsellers/Grid.php | 1 +
.../Block/Adminhtml/Sales/Coupons/Grid.php | 2 ++
.../Block/Adminhtml/Sales/Invoiced/Grid.php | 1 +
.../Block/Adminhtml/Sales/Refunded/Grid.php | 1 +
.../Block/Adminhtml/Sales/Sales/Grid.php | 2 ++
.../Block/Adminhtml/Sales/Shipping/Grid.php | 1 +
.../Block/Adminhtml/Sales/Tax/Grid.php | 2 ++
.../Adminhtml/Shopcart/Abandoned/Grid.php | 2 ++
.../Adminhtml/Shopcart/Customer/Grid.php | 1 +
.../Block/Adminhtml/Shopcart/Product/Grid.php | 1 +
.../Controller/Adminhtml/Report/Sales.php | 3 +++
app/code/Magento/Reports/Helper/Data.php | 1 +
.../Magento/Reports/Model/Event/Observer.php | 4 ++++
app/code/Magento/Reports/Model/Item.php | 1 +
.../Model/Product/Index/AbstractIndex.php | 1 +
.../Reports/Model/Product/Index/Compared.php | 1 +
.../Summary/Collection/AbstractCollection.php | 2 ++
.../Magento/Reports/Model/Resource/Event.php | 2 ++
.../Model/Resource/Order/Collection.php | 5 +++++
.../Model/Resource/Product/Collection.php | 3 +++
.../Index/Collection/AbstractCollection.php | 3 +++
.../Resource/Product/Lowstock/Collection.php | 3 +++
.../Model/Resource/Report/AbstractReport.php | 2 ++
.../Model/Resource/Report/Product/Viewed.php | 1 +
.../Report/Product/Viewed/Collection.php | 6 ++++++
.../Resource/Review/Customer/Collection.php | 1 +
.../Resource/Shopcart/Product/Collection.php | 1 +
app/code/Magento/Reports/Model/Totals.php | 2 ++
.../Review/Block/Adminhtml/Add/Form.php | 1 +
.../Magento/Review/Block/Adminhtml/Edit.php | 1 +
.../Review/Block/Adminhtml/Edit/Form.php | 1 +
.../Magento/Review/Block/Adminhtml/Grid.php | 1 +
.../Adminhtml/Product/Edit/Tab/Reviews.php | 3 +++
.../Review/Block/Adminhtml/Product/Grid.php | 1 +
.../Block/Adminhtml/Rating/Detailed.php | 1 +
.../Block/Adminhtml/Rating/Edit/Tab/Form.php | 3 +++
app/code/Magento/Review/Block/Form.php | 2 ++
.../Magento/Review/Block/Product/View.php | 2 ++
.../Controller/Adminhtml/Product/Save.php | 1 +
.../Magento/Review/Controller/Product.php | 2 ++
.../Review/Controller/Product/Post.php | 1 +
app/code/Magento/Review/Helper/Data.php | 1 +
.../Magento/Review/Model/Resource/Rating.php | 1 +
.../Resource/Review/Product/Collection.php | 2 ++
app/code/Magento/Review/Model/Review.php | 2 ++
app/code/Magento/Rule/Model/AbstractModel.php | 4 ++++
.../Rule/Model/Action/AbstractAction.php | 1 +
.../Model/Condition/AbstractCondition.php | 9 ++++++++
.../Magento/Rule/Model/Condition/Combine.php | 1 +
.../Condition/Product/AbstractProduct.php | 9 ++++++++
.../Rule/Model/Condition/Sql/Builder.php | 1 +
.../Block/Adminhtml/Order/Address/Form.php | 2 ++
.../Adminhtml/Order/Create/AbstractCreate.php | 1 +
.../Order/Create/Billing/Address.php | 1 +
.../Block/Adminhtml/Order/Create/Form.php | 1 +
.../Order/Create/Form/AbstractForm.php | 2 ++
.../Adminhtml/Order/Create/Form/Account.php | 1 +
.../Adminhtml/Order/Create/Form/Address.php | 1 +
.../Adminhtml/Order/Create/Items/Grid.php | 3 +++
.../Order/Create/Shipping/Address.php | 4 ++++
.../Order/Create/Sidebar/AbstractSidebar.php | 2 ++
.../Block/Adminhtml/Order/Create/Totals.php | 1 +
.../Order/Create/Totals/Discount.php | 1 +
.../Order/Create/Totals/Grandtotal.php | 1 +
.../Order/Create/Totals/Shipping.php | 1 +
.../Order/Create/Totals/Subtotal.php | 1 +
.../Adminhtml/Order/Create/Totals/Tax.php | 1 +
.../Adminhtml/Order/Invoice/Create/Items.php | 1 +
.../Block/Adminhtml/Order/Invoice/View.php | 2 ++
.../Adminhtml/Order/Status/Edit/Form.php | 1 +
.../Sales/Block/Adminhtml/Order/View.php | 3 +++
.../Block/Adminhtml/Report/Filter/Form.php | 1 +
.../Adminhtml/Report/Filter/Form/Coupon.php | 1 +
.../Adminhtml/Report/Filter/Form/Order.php | 2 ++
.../Config/Form/Fieldset/Order/Statuses.php | 1 +
.../Sales/Block/Items/AbstractItems.php | 3 +++
.../Order/Item/Renderer/DefaultRenderer.php | 1 +
app/code/Magento/Sales/Block/Order/Totals.php | 1 +
.../Sales/Block/Status/Grid/Column/State.php | 1 +
.../Block/Status/Grid/Column/Unassign.php | 1 +
.../Creditmemo/AbstractCreditmemo/View.php | 1 +
.../Sales/Controller/Adminhtml/Order.php | 2 ++
.../Controller/Adminhtml/Order/Create.php | 4 ++++
.../Adminhtml/Order/Create/Save.php | 1 +
.../Adminhtml/Order/Creditmemo/Save.php | 2 ++
.../Adminhtml/Order/CreditmemoLoader.php | 2 ++
.../Adminhtml/Order/Invoice/Save.php | 3 +++
.../Controller/Adminhtml/Order/Pdfdocs.php | 1 +
.../Shipment/AbstractShipment/View.php | 1 +
.../Download/DownloadCustomOption.php | 2 ++
.../Order/Plugin/Authentication.php | 1 +
app/code/Magento/Sales/Helper/Guest.php | 1 +
.../Magento/Sales/Model/AdminOrder/Create.php | 18 ++++++++++++++++
.../Magento/Sales/Model/Config/Converter.php | 1 +
.../Magento/Sales/Model/Convert/Order.php | 3 +++
.../Magento/Sales/Model/Convert/Quote.php | 1 +
app/code/Magento/Sales/Model/Order.php | 12 +++++++++++
.../Magento/Sales/Model/Order/Address.php | 2 ++
.../Magento/Sales/Model/Order/Builder.php | 3 +++
.../Magento/Sales/Model/Order/Creditmemo.php | 5 +++++
.../Sales/Model/Order/Creditmemo/Comment.php | 1 +
.../Order/Creditmemo/Total/AbstractTotal.php | 1 +
.../Magento/Sales/Model/Order/Customer.php | 1 +
.../Magento/Sales/Model/Order/Invoice.php | 5 +++++
.../Sales/Model/Order/Invoice/Comment.php | 1 +
.../Order/Invoice/Total/AbstractTotal.php | 1 +
.../Sales/Model/Order/Invoice/Total/Tax.php | 1 +
app/code/Magento/Sales/Model/Order/Item.php | 8 +++++++
.../Magento/Sales/Model/Order/Payment.php | 14 +++++++++++++
.../Sales/Model/Order/Payment/Transaction.php | 8 +++++++
.../Sales/Model/Order/Pdf/AbstractPdf.php | 10 +++++++++
.../Sales/Model/Order/Pdf/Creditmemo.php | 1 +
.../Magento/Sales/Model/Order/Pdf/Invoice.php | 1 +
.../Model/Order/Pdf/Items/AbstractItems.php | 1 +
.../Sales/Model/Order/Pdf/Shipment.php | 1 +
.../Model/Order/Pdf/Total/DefaultTotal.php | 1 +
.../Magento/Sales/Model/Order/Shipment.php | 2 ++
.../Sales/Model/Order/Shipment/Comment.php | 1 +
.../Sales/Model/Order/Shipment/Track.php | 1 +
.../Sales/Model/Order/Status/History.php | 1 +
app/code/Magento/Sales/Model/Quote.php | 15 +++++++++++++
.../Magento/Sales/Model/Quote/Address.php | 11 ++++++++++
.../Quote/Address/Total/AbstractTotal.php | 3 +++
.../Model/Quote/Address/Total/Collector.php | 1 +
.../Model/Quote/Address/Total/Discount.php | 1 +
.../Model/Quote/Address/Total/Shipping.php | 3 +++
.../Sales/Model/Quote/Address/Total/Tax.php | 3 +++
app/code/Magento/Sales/Model/Quote/Item.php | 1 +
.../Sales/Model/Quote/Item/AbstractItem.php | 1 +
.../Sales/Model/Quote/Item/Updater.php | 1 +
.../Magento/Sales/Model/Quote/Payment.php | 1 +
.../QuoteRepository/Plugin/Authorization.php | 2 ++
.../Collection/AbstractCollection.php | 1 +
.../Magento/Sales/Model/Resource/Entity.php | 1 +
.../Model/Resource/Order/Grid/Collection.php | 1 +
.../Model/Resource/Order/Handler/State.php | 2 ++
.../Resource/Order/Plugin/Authorization.php | 1 +
.../Sales/Model/Resource/Order/Status.php | 1 +
.../Quote/Address/Attribute/Backend.php | 1 +
.../Quote/Address/Attribute/Frontend.php | 1 +
.../Model/Resource/Quote/Item/Collection.php | 1 +
.../Model/Resource/Report/Bestsellers.php | 2 ++
.../Report/Bestsellers/Collection.php | 3 +++
.../Sales/Model/Resource/Report/Invoiced.php | 1 +
.../Model/Resource/Report/Order/Createdat.php | 2 ++
.../Sales/Model/Resource/Report/Refunded.php | 1 +
.../Sales/Model/Resource/Report/Shipping.php | 1 +
.../Magento/Sales/Model/Resource/Setup.php | 2 ++
.../Magento/Sales/Model/Service/Order.php | 5 +++++
.../Magento/Sales/Model/Service/Quote.php | 4 ++++
.../Promo/Quote/Edit/Tab/Actions.php | 1 +
.../Promo/Quote/Edit/Tab/Coupons/Form.php | 1 +
.../Adminhtml/Promo/Quote/Edit/Tab/Main.php | 2 ++
.../Controller/Adminhtml/Promo/Quote/Edit.php | 1 +
.../Controller/Adminhtml/Promo/Quote/Save.php | 2 ++
app/code/Magento/SalesRule/Model/Observer.php | 4 ++++
.../SalesRule/Model/Quote/Discount.php | 1 +
.../Model/Resource/Report/Rule/Createdat.php | 1 +
app/code/Magento/SalesRule/Model/Rule.php | 5 +++++
.../Model/Rule/Condition/Product/Found.php | 1 +
.../Magento/SalesRule/Model/RulesApplier.php | 1 +
app/code/Magento/SalesRule/Model/Utility.php | 3 +++
.../Magento/SalesRule/Model/Validator.php | 3 +++
.../Search/Block/Adminhtml/Dashboard/Last.php | 1 +
.../Search/Block/Adminhtml/Dashboard/Top.php | 1 +
.../Search/Block/Adminhtml/Term/Edit/Form.php | 1 +
.../Search/Controller/Adminhtml/Term/Edit.php | 1 +
.../Search/Controller/Adminhtml/Term/Save.php | 1 +
app/code/Magento/Search/Helper/Data.php | 1 +
app/code/Magento/Search/Model/Query.php | 1 +
.../Magento/Search/Model/Resource/Helper.php | 1 +
.../Controller/Product/Sendmail.php | 1 +
.../Magento/Sendfriend/Model/Observer.php | 1 +
.../Sendfriend/Model/Resource/Sendfriend.php | 1 +
.../Magento/Sendfriend/Model/Sendfriend.php | 5 +++++
.../Shipping/Block/Adminhtml/View/Form.php | 1 +
.../Magento/Shipping/Block/Tracking/Popup.php | 1 +
.../Order/Shipment/MassPrintShippingLabel.php | 1 +
.../Adminhtml/Order/Shipment/Save.php | 2 ++
.../Model/Carrier/AbstractCarrier.php | 7 +++++++
.../Model/Carrier/AbstractCarrierOnline.php | 6 ++++++
.../Shipping/Model/Order/Pdf/Packaging.php | 7 +++++++
.../Magento/Shipping/Model/Rate/Result.php | 1 +
app/code/Magento/Shipping/Model/Shipping.php | 7 +++++++
.../Model/Shipping/LabelGenerator.php | 3 +++
.../Shipping/Model/Shipping/Labels.php | 4 ++++
.../Controller/Adminhtml/Sitemap/Edit.php | 1 +
.../Controller/Adminhtml/Sitemap/Save.php | 1 +
app/code/Magento/Sitemap/Model/Observer.php | 2 ++
.../Model/Resource/Catalog/Product.php | 1 +
app/code/Magento/Sitemap/Model/Sitemap.php | 3 +++
.../Store/App/Action/Plugin/Context.php | 1 +
.../Store/Model/Resource/Group/Collection.php | 1 +
.../Store/Model/Resource/Store/Collection.php | 1 +
.../Model/Resource/Website/Collection.php | 1 +
app/code/Magento/Store/Model/Storage/Db.php | 8 +++++++
.../Magento/Store/Model/StorageFactory.php | 3 +++
app/code/Magento/Store/Model/Store.php | 8 +++++++
app/code/Magento/Store/Model/System/Store.php | 4 ++++
app/code/Magento/Store/Model/Website.php | 3 +++
.../Api/Data/QuoteDetailsItemInterface.php | 1 +
.../Magento/Tax/Block/Adminhtml/Rate/Form.php | 7 +++++++
.../Tax/Block/Adminhtml/Rule/Edit/Form.php | 3 +++
.../Block/Checkout/Cart/Sidebar/Totals.php | 3 +++
.../Magento/Tax/Block/Sales/Order/Tax.php | 1 +
.../Magento/Tax/Controller/Adminhtml/Rule.php | 1 +
app/code/Magento/Tax/Helper/Data.php | 4 ++++
app/code/Magento/Tax/Model/Calculation.php | 6 ++++++
.../Model/Calculation/AbstractCalculator.php | 3 +++
.../Magento/Tax/Model/Calculation/Rate.php | 4 ++++
.../Tax/Model/Calculation/RateRepository.php | 3 +++
.../Magento/Tax/Model/Calculation/Rule.php | 1 +
.../Tax/Model/Calculation/Rule/Validator.php | 3 +++
app/code/Magento/Tax/Model/Config.php | 6 ++++++
app/code/Magento/Tax/Model/Observer.php | 4 ++++
.../Tax/Model/Resource/Calculation.php | 5 +++++
.../Sales/Total/Quote/CommonTaxCollector.php | 3 +++
.../Tax/Model/Sales/Total/Quote/Tax.php | 3 +++
app/code/Magento/Tax/Model/TaxCalculation.php | 3 +++
.../Magento/Tax/Model/TaxClass/Repository.php | 3 +++
.../Magento/Tax/Model/TaxRuleRepository.php | 3 +++
.../Model/Rate/CsvImportHandler.php | 1 +
.../Translation/Model/Inline/Parser.php | 2 ++
.../Translation/Model/Js/DataProvider.php | 1 +
.../Magento/Ui/Component/AbstractView.php | 2 ++
.../Magento/Ui/Component/Filter/Type/Date.php | 2 ++
app/code/Magento/Ui/Component/Form.php | 2 ++
.../Form/Element/AbstractFormElement.php | 1 +
.../Form/Element/ElementInterface.php | 1 +
.../Ui/Component/Form/Element/Radio.php | 1 +
.../Ui/Component/Form/Element/Select.php | 1 +
.../Magento/Ui/Component/Form/Fieldset.php | 1 +
.../Ui/Component/Layout/AbstractStructure.php | 4 ++++
app/code/Magento/Ui/Component/Listing.php | 1 +
.../Ui/DataProvider/Config/Converter.php | 3 +++
app/code/Magento/Ui/DataProvider/Manager.php | 1 +
app/code/Magento/Ui/DataProvider/Metadata.php | 3 +++
app/code/Magento/Ups/Helper/Config.php | 1 +
app/code/Magento/Ups/Model/Carrier.php | 16 ++++++++++++++
.../Model/Config/Source/OriginShipment.php | 1 +
.../Ups/Model/Config/Source/Unitofmeasure.php | 1 +
.../UrlRewrite/Block/Catalog/Product/Grid.php | 1 +
.../UrlRewrite/Block/Cms/Page/Grid.php | 1 +
.../User/Controller/Adminhtml/User/Save.php | 2 ++
app/code/Magento/User/Model/Resource/User.php | 1 +
.../Tab/General/Shipping/Packaging/Plugin.php | 2 ++
app/code/Magento/Usps/Model/Carrier.php | 19 +++++++++++++++++
app/code/Magento/Weee/Helper/Data.php | 1 +
.../Weee/Model/Attribute/Backend/Weee/Tax.php | 1 +
app/code/Magento/Weee/Model/Observer.php | 4 ++++
app/code/Magento/Weee/Model/Tax.php | 6 ++++++
.../Weee/Model/Total/Creditmemo/Weee.php | 4 ++++
.../Magento/Weee/Model/Total/Invoice/Weee.php | 3 +++
.../Magento/Weee/Model/Total/Quote/Weee.php | 2 ++
.../Weee/Model/Total/Quote/WeeeTax.php | 2 ++
.../Widget/Block/Adminhtml/Widget/Chooser.php | 1 +
.../Widget/Instance/Edit/Tab/Main.php | 1 +
.../Widget/Instance/Edit/Tab/Main/Layout.php | 1 +
.../Widget/Instance/Edit/Tab/Properties.php | 3 +++
.../Widget/Block/Adminhtml/Widget/Options.php | 2 ++
.../Widget/Model/NamespaceResolver.php | 2 ++
.../Magento/Widget/Model/Template/Filter.php | 2 ++
app/code/Magento/Widget/Model/Widget.php | 2 ++
.../Magento/Widget/Model/Widget/Instance.php | 7 +++++++
.../Magento/Wishlist/Block/AbstractBlock.php | 1 +
.../Wishlist/Block/Customer/Sidebar.php | 1 +
.../Magento/Wishlist/Controller/Index/Add.php | 3 +++
.../Wishlist/Controller/Index/Cart.php | 5 +++++
.../Controller/Index/DownloadCustomOption.php | 2 ++
.../Wishlist/Controller/Index/Fromcart.php | 1 +
.../Wishlist/Controller/Index/Send.php | 6 ++++++
.../Wishlist/Controller/Index/Update.php | 2 ++
.../Wishlist/Controller/WishlistProvider.php | 1 +
app/code/Magento/Wishlist/Helper/Data.php | 1 +
app/code/Magento/Wishlist/Helper/Rss.php | 4 ++++
app/code/Magento/Wishlist/Model/Item.php | 2 ++
.../Magento/Wishlist/Model/ItemCarrier.php | 6 ++++++
app/code/Magento/Wishlist/Model/Observer.php | 3 +++
.../Model/Resource/Item/Collection.php | 2 ++
.../Model/Resource/Item/Collection/Grid.php | 3 +++
app/code/Magento/Wishlist/Model/Wishlist.php | 6 ++++++
735 files changed, 1946 insertions(+)
diff --git a/app/code/Magento/AdminNotification/Model/Observer.php b/app/code/Magento/AdminNotification/Model/Observer.php
index ab7c5de87ba..6a56cfdfbe5 100644
--- a/app/code/Magento/AdminNotification/Model/Observer.php
+++ b/app/code/Magento/AdminNotification/Model/Observer.php
@@ -38,6 +38,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function preDispatch(\Magento\Framework\Event\Observer $observer)
{
diff --git a/app/code/Magento/AdminNotification/Model/Resource/Inbox.php b/app/code/Magento/AdminNotification/Model/Resource/Inbox.php
index 9075e975839..d4db2049646 100644
--- a/app/code/Magento/AdminNotification/Model/Resource/Inbox.php
+++ b/app/code/Magento/AdminNotification/Model/Resource/Inbox.php
@@ -57,6 +57,7 @@ class Inbox extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\AdminNotification\Model\Inbox $object
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
{
@@ -86,6 +87,7 @@ class Inbox extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\AdminNotification\Model\Inbox $object
* @param array $data
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function parse(\Magento\AdminNotification\Model\Inbox $object, array $data)
{
diff --git a/app/code/Magento/Authorization/Model/Acl/AclRetriever.php b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
index bbe4491d5cf..ffe8ee789d6 100644
--- a/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
+++ b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
@@ -16,6 +16,7 @@ use Psr\Log\LoggerInterface as Logger;
/**
* Permission tree retriever
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class AclRetriever
{
diff --git a/app/code/Magento/Backend/App/Action.php b/app/code/Magento/Backend/App/Action.php
index 3fca0cbd88c..0f35f667440 100644
--- a/app/code/Magento/Backend/App/Action.php
+++ b/app/code/Magento/Backend/App/Action.php
@@ -8,6 +8,9 @@
*/
namespace Magento\Backend\App;
+/**
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
class Action extends \Magento\Backend\App\AbstractAction
{
}
diff --git a/app/code/Magento/Backend/App/Action/Context.php b/app/code/Magento/Backend/App/Action/Context.php
index 400c3574ff9..3cad615401f 100644
--- a/app/code/Magento/Backend/App/Action/Context.php
+++ b/app/code/Magento/Backend/App/Action/Context.php
@@ -6,6 +6,7 @@ namespace Magento\Backend\App\Action;
/**
* Backend Controller context
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Context extends \Magento\Framework\App\Action\Context
{
@@ -67,6 +68,7 @@ class Context extends \Magento\Framework\App\Action\Context
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param bool $canUseBaseUrl
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\RequestInterface $request,
@@ -135,6 +137,7 @@ class Context extends \Magento\Framework\App\Action\Context
/**
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCanUseBaseUrl()
{
diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/app/code/Magento/Backend/App/DefaultPath.php
index 3b66a0d0655..2dd5c2a2810 100644
--- a/app/code/Magento/Backend/App/DefaultPath.php
+++ b/app/code/Magento/Backend/App/DefaultPath.php
@@ -15,6 +15,7 @@ class DefaultPath implements \Magento\Framework\App\DefaultPathInterface
/**
* @param \Magento\Backend\App\ConfigInterface $config
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function __construct(\Magento\Backend\App\ConfigInterface $config)
{
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
index 93add0bb0aa..eaa95f5ff62 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -185,6 +185,10 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
*
* @param bool $directUrl
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getChartUrl($directUrl = true)
{
diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
index ab8cc958173..1ee9d3368b0 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Backend\Block\Dashboard\Orders;
* Adminhtml dashboard recent orders grid
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Backend\Block\Dashboard\Grid
{
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
index 823e1d06f72..334ef2b0e76 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
@@ -8,6 +8,7 @@ namespace Magento\Backend\Block\Dashboard\Tab\Customers;
* Adminhtml dashboard most active buyers
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Most extends \Magento\Backend\Block\Dashboard\Grid
{
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
index 262e590c3a2..33c6e5305e9 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
@@ -8,6 +8,7 @@ namespace Magento\Backend\Block\Dashboard\Tab\Customers;
* Adminhtml dashboard most recent customers grid
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Newest extends \Magento\Backend\Block\Dashboard\Grid
{
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
index 98d881edbe9..f566daf358b 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
@@ -8,6 +8,7 @@ namespace Magento\Backend\Block\Dashboard\Tab\Products;
* Adminhtml dashboard most ordered products grid
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Ordered extends \Magento\Backend\Block\Dashboard\Grid
{
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
index 7fdd30ab3de..665c5de9161 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
@@ -8,6 +8,7 @@ namespace Magento\Backend\Block\Dashboard\Tab\Products;
* Adminhtml dashboard most viewed products grid
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Viewed extends \Magento\Backend\Block\Dashboard\Grid
{
diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Field.php b/app/code/Magento/Backend/Block/System/Config/Form/Field.php
index b2cec8e2eab..f97740950c7 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form/Field.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form/Field.php
@@ -13,6 +13,7 @@ namespace Magento\Backend\Block\System\Config\Form;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Field extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
{
diff --git a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
index d65978892ea..6c0e46c1cb2 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
@@ -34,6 +34,7 @@ class ButtonList
* @param integer $sortOrder
* @param string|null $region That button should be displayed in ('toolbar', 'header', 'footer', null)
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function add($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
{
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index 909bd357a7d..cc924eb6fe0 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -8,6 +8,7 @@ namespace Magento\Backend\Block\Widget\Form;
* Backend form container block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Container extends \Magento\Backend\Block\Widget\Container
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
index 1d795fd631a..f089a3e0603 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid.php
@@ -9,6 +9,7 @@ namespace Magento\Backend\Block\Widget;
*
* @method string getRowClickCallback() getRowClickCallback()
* @method \Magento\Backend\Block\Widget\Grid setRowClickCallback() setRowClickCallback(string $value)
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class Grid extends \Magento\Backend\Block\Widget
{
@@ -145,6 +146,7 @@ class Grid extends \Magento\Backend\Block\Widget
/**
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _construct()
{
@@ -330,6 +332,7 @@ class Grid extends \Magento\Backend\Block\Widget
* Apply sorting and filtering to collection
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareCollection()
{
@@ -577,6 +580,7 @@ class Grid extends \Magento\Backend\Block\Widget
* Return visibility of pager
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getPagerVisibility()
{
@@ -598,6 +602,7 @@ class Grid extends \Magento\Backend\Block\Widget
* Return visibility of message blocks
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getMessageBlockVisibility()
{
@@ -760,6 +765,7 @@ class Grid extends \Magento\Backend\Block\Widget
* Return count totals
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCountTotals()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column.php b/app/code/Magento/Backend/Block/Widget/Grid/Column.php
index 21a64e49faa..bf6ec395a97 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column.php
@@ -231,6 +231,7 @@ class Column extends \Magento\Backend\Block\Widget
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getSortable()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php
index 8cdd868a744..330510f558b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php
@@ -36,6 +36,8 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil
* Render HTML of the element
*
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getHtml()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
index 60ab490595c..552e17df9aa 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
@@ -9,6 +9,7 @@ use Magento\Framework\Object;
/**
* Backend grid item abstract renderer
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock implements RendererInterface
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index 410f2e3854f..33630b4a59a 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -115,6 +115,8 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
* @param string &$actionCaption
* @param \Magento\Framework\Object $row
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _transformActionData(&$action, &$actionCaption, \Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
index d18e27bd75a..378c7bcedf5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
@@ -69,6 +69,8 @@ class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
*
* @param \Magento\Framework\Object $row
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function render(\Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options.php
index 87a3ab23d8e..433dedfd5b7 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options.php
@@ -26,6 +26,7 @@ class Options extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
*
* @param \Magento\Framework\Object $row
* @return string|void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function render(\Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
index ee47da4f0d5..e80367cc636 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
@@ -52,6 +52,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
* Retrieve 'show all stores label' flag
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
protected function _getShowAllStoresLabelFlag()
{
@@ -66,6 +67,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
* Retrieve 'show empty stores label' flag
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
protected function _getShowEmptyStoresLabelFlag()
{
@@ -81,6 +83,8 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
*
* @param \Magento\Framework\Object $row
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function render(\Magento\Framework\Object $row)
{
@@ -131,6 +135,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
*
* @param \Magento\Framework\Object $row
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function renderExport(\Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
index 343281001de..0393419a282 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
@@ -100,6 +100,7 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
* @param \Magento\Backend\Model\Widget\Grid\SubTotals $subtotals
* @param \Magento\Backend\Model\Widget\Grid\Totals $totals
* @param array $data
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
@@ -485,6 +486,7 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
* Retrieve flag is collapsed
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsCollapsed()
{
@@ -527,6 +529,7 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
* Return count subtotals
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCountSubTotals()
{
@@ -549,6 +552,7 @@ class ColumnSet extends \Magento\Framework\View\Element\Template
* Return count totals
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCountTotals()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Container.php b/app/code/Magento/Backend/Block/Widget/Grid/Container.php
index fc923840eb9..8b034bf6623 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Container.php
@@ -8,6 +8,7 @@ namespace Magento\Backend\Block\Widget\Grid;
* Backend grid container block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Container extends \Magento\Backend\Block\Widget\Container
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Export.php b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
index 248a1bf4027..5ec6857e3ab 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Export.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
@@ -105,6 +105,7 @@ class Export extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
* Return count totals
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCountTotals()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
index 611e2d1af94..642719e3cb5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -6,6 +6,12 @@ namespace Magento\Backend\Block\Widget\Grid;
use Magento\Framework\App\Filesystem\DirectoryList;
+/**
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Backend\Block\Widget\Grid\ExportInterface
{
/**
@@ -777,6 +783,7 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
* Return visibility of column headers
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getHeadersVisibility()
{
@@ -798,6 +805,7 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
* Return visibility of filter
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getFilterVisibility()
{
@@ -864,6 +872,7 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
* Retrieve flag is collapsed
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsCollapsed()
{
@@ -1242,6 +1251,7 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
* Return count subtotals
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCountSubTotals()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index cb95460a476..a827a3b551a 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -294,6 +294,7 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
* Retrieve select all functionality flag check
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseSelectAll()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
index 4cba44195ff..07453f87e3c 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
@@ -305,6 +305,7 @@ class Extended extends \Magento\Backend\Block\Widget
* Retrieve select all functionality flag check
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseSelectAll()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index b58495a86ac..5128c6f412e 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -8,6 +8,7 @@ use Magento\Backend\Block\Widget\Tab\TabInterface;
/**
* Tabs block
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Tabs extends \Magento\Backend\Block\Widget
{
@@ -105,6 +106,7 @@ class Tabs extends \Magento\Backend\Block\Widget
* @param array|\Magento\Framework\Object|string $tab
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addTab($tabId, $tab)
{
@@ -301,6 +303,7 @@ class Tabs extends \Magento\Backend\Block\Widget
/**
* @param \Magento\Framework\Object|TabInterface $tab
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getTabIsHidden($tab)
{
@@ -389,6 +392,7 @@ class Tabs extends \Magento\Backend\Block\Widget
* @param string $tabOneId
* @param string $tabTwoId
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function bindShadowTabs($tabOneId, $tabTwoId)
{
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php
index fa14e28e5c5..dba0f827bd8 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php
@@ -28,6 +28,7 @@ class Status extends \Magento\Backend\Controller\Adminhtml\System\Config\System\
* Retrieve synchronize process state and it's parameters in json format
*
* @return \Magento\Framework\Controller\Result\JSON
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
index 41ced9589d0..a454c7a7ae6 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
@@ -9,6 +9,8 @@ class EditStore extends \Magento\Backend\Controller\Adminhtml\System\Store
{
/**
* @return \Magento\Framework\Controller\ResultInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
index bf93b4c2558..cd4031a15fd 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
@@ -10,6 +10,7 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Store
{
/**
* @return \Magento\Backend\Model\View\Result\Redirect
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Backend/Model/Auth/Session.php b/app/code/Magento/Backend/Model/Auth/Session.php
index b14281e3c19..3c4f0fd9236 100644
--- a/app/code/Magento/Backend/Model/Auth/Session.php
+++ b/app/code/Magento/Backend/Model/Auth/Session.php
@@ -63,6 +63,7 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
* @param \Magento\Framework\Acl\Builder $aclBuilder
* @param \Magento\Backend\Model\UrlInterface $backendUrl
* @param \Magento\Backend\App\ConfigInterface $config
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Request\Http $request,
diff --git a/app/code/Magento/Backend/Model/Config.php b/app/code/Magento/Backend/Model/Config.php
index 2d6b82c5f73..25a2b760aae 100644
--- a/app/code/Magento/Backend/Model/Config.php
+++ b/app/code/Magento/Backend/Model/Config.php
@@ -9,6 +9,7 @@ namespace Magento\Backend\Model;
* Used to save configuration
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Config extends \Magento\Framework\Object
{
@@ -178,6 +179,9 @@ class Config extends \Magento\Framework\Object
* @param \Magento\Framework\DB\Transaction $saveTransaction
* @param \Magento\Framework\DB\Transaction $deleteTransaction
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _processGroup(
$groupId,
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Converter.php b/app/code/Magento/Backend/Model/Config/Structure/Converter.php
index 6430ef27265..41ab9804c6f 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Converter.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Converter.php
@@ -71,6 +71,8 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
*
* @param \DOMNode $root
* @return array|null
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _convertDOMDocument(\DOMNode $root)
{
diff --git a/app/code/Magento/Backend/Model/Locale/Resolver.php b/app/code/Magento/Backend/Model/Locale/Resolver.php
index ce2c51b9049..b7b6dda8c4b 100644
--- a/app/code/Magento/Backend/Model/Locale/Resolver.php
+++ b/app/code/Magento/Backend/Model/Locale/Resolver.php
@@ -40,6 +40,7 @@ class Resolver extends \Magento\Framework\Locale\Resolver
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Framework\Locale\Validator $localeValidator
* @param null $locale
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Backend/Model/Menu/Config.php b/app/code/Magento/Backend/Model/Menu/Config.php
index 19f9c2526a7..2f625157120 100644
--- a/app/code/Magento/Backend/Model/Menu/Config.php
+++ b/app/code/Magento/Backend/Model/Menu/Config.php
@@ -4,6 +4,9 @@
*/
namespace Magento\Backend\Model\Menu;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Config
{
const CACHE_ID = 'backend_menu_config';
diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 3b1b7149aed..2da20fd5cd3 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -21,6 +21,7 @@ use Magento\Customer\Api\GroupManagementInterface;
* @method int getCurrencyId()
* @method Quote setOrderId($orderId)
* @method int getOrderId()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Quote extends \Magento\Framework\Session\SessionManager
{
@@ -86,6 +87,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param GroupManagementInterface $groupManagement
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Request\Http $request,
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
index d594ed09070..f1a59c9cdb4 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php
@@ -14,6 +14,7 @@ class Create extends \Magento\Backup\Controller\Adminhtml\Index
* Create backup action
*
* @return void|\Magento\Backend\App\Action
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php
index e9b22751e44..5f68a92b958 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php
@@ -13,6 +13,7 @@ class Download extends \Magento\Backup\Controller\Adminhtml\Index
* Download backup action
*
* @return void|\Magento\Backend\App\Action
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function execute()
{
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
index 20723783b18..5c5640fe07a 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Rollback.php
@@ -14,6 +14,9 @@ class Rollback extends \Magento\Backup\Controller\Adminhtml\Index
* Rollback Action
*
* @return void|\Magento\Backend\App\Action
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function execute()
{
diff --git a/app/code/Magento/Backup/Model/Backup.php b/app/code/Magento/Backup/Model/Backup.php
index 5e0f62ba27e..44369629987 100644
--- a/app/code/Magento/Backup/Model/Backup.php
+++ b/app/code/Magento/Backup/Model/Backup.php
@@ -12,6 +12,7 @@ use Magento\Framework\App\Filesystem\DirectoryList;
* @method string getPath()
* @method string getName()
* @method string getTime()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Backup extends \Magento\Framework\Object implements \Magento\Framework\Backup\Db\BackupInterface
{
diff --git a/app/code/Magento/Backup/Model/Resource/Db.php b/app/code/Magento/Backup/Model/Resource/Db.php
index e9b47b2c97a..1d53303e710 100644
--- a/app/code/Magento/Backup/Model/Resource/Db.php
+++ b/app/code/Magento/Backup/Model/Resource/Db.php
@@ -180,6 +180,7 @@ class Db
* @param string $tableName
* @param bool $step
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getTableDataDump($tableName, $step = false)
{
diff --git a/app/code/Magento/Backup/Model/Resource/Helper.php b/app/code/Magento/Backup/Model/Resource/Helper.php
index 8b3b530a0d0..a2e8c11c931 100644
--- a/app/code/Magento/Backup/Model/Resource/Helper.php
+++ b/app/code/Magento/Backup/Model/Resource/Helper.php
@@ -119,6 +119,7 @@ class Helper extends \Magento\Framework\DB\Helper
* @param string $tableName
* @param bool $withForeignKeys
* @return string
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getTableCreateSql($tableName, $withForeignKeys = false)
{
diff --git a/app/code/Magento/Bundle/Api/Data/LinkInterface.php b/app/code/Magento/Bundle/Api/Data/LinkInterface.php
index af85c0db527..88498863dd3 100644
--- a/app/code/Magento/Bundle/Api/Data/LinkInterface.php
+++ b/app/code/Magento/Bundle/Api/Data/LinkInterface.php
@@ -47,6 +47,7 @@ interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
* Get is default
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsDefault();
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
index 40135566a28..46398975c1e 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -6,6 +6,7 @@ namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab;
/**
* Bundle product attributes tab
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Attributes extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes
{
@@ -13,6 +14,8 @@ class Attributes extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attri
* Prepare attributes form of bundle product
*
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
index 1b115524439..d093ac060dc 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -53,6 +53,9 @@ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Ele
* Get Element Html
*
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getElementHtml()
{
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
index 2b06cc3cd85..a60a02d9e62 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -69,6 +69,7 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
/**
* @param mixed $item
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isShipmentSeparately($item = null)
{
@@ -104,6 +105,7 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
/**
* @param mixed $item
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isChildCalculated($item = null)
{
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
index 828f482ecb0..3dea7076255 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
@@ -32,6 +32,7 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\
/**
* @param null|object $item
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isShipmentSeparately($item = null)
{
@@ -64,6 +65,7 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\
/**
* @param null|object $item
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isChildCalculated($item = null)
{
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index d7b78e32244..5b33daae698 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -271,6 +271,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
* @param int $elementId
* @param int $containerId
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setValidationContainer($elementId, $containerId)
{
diff --git a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
index 27c67359b7e..6694b30acaa 100644
--- a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -37,6 +37,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
* @param Configuration $bundleProductConfiguration
* @param \Magento\Framework\Module\Manager $moduleManager
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
@@ -82,6 +83,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
*
* @param bool $useCache
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getBundleOptions($useCache = true)
{
diff --git a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
index 698f54a46fe..a476771d6c0 100644
--- a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
@@ -16,6 +16,7 @@ class Renderer extends \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer
/**
* @param mixed $item
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isShipmentSeparately($item = null)
{
@@ -51,6 +52,7 @@ class Renderer extends \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer
/**
* @param mixed $item
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isChildCalculated($item = null)
{
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
index 02d65c1bc2e..679c5bd17e8 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
@@ -27,6 +27,7 @@ class Bundle
*
* @return \Magento\Catalog\Model\Product
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function afterInitialize(
\Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper $subject,
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
index 68ee05b2f32..7f2b5a22669 100644
--- a/app/code/Magento/Bundle/Model/LinkManagement.php
+++ b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -9,6 +9,9 @@ use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Framework\Exception\CouldNotSaveException;
use Magento\Framework\Exception\InputException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterface
{
/**
@@ -95,6 +98,8 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addChild(
\Magento\Catalog\Api\Data\ProductInterface $product,
diff --git a/app/code/Magento/Bundle/Model/Observer.php b/app/code/Magento/Bundle/Model/Observer.php
index b8f77c23cb4..f80347079f7 100644
--- a/app/code/Magento/Bundle/Model/Observer.php
+++ b/app/code/Magento/Bundle/Model/Observer.php
@@ -66,6 +66,8 @@ class Observer
*
* @param \Magento\Framework\Object $observer
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function appendUpsellProducts($observer)
{
diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php
index b577c776573..1c08ef0efe4 100644
--- a/app/code/Magento/Bundle/Model/OptionRepository.php
+++ b/app/code/Magento/Bundle/Model/OptionRepository.php
@@ -9,6 +9,9 @@ use Magento\Framework\Exception\CouldNotSaveException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Webapi\Exception;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInterface
{
/**
@@ -144,6 +147,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function save(
\Magento\Catalog\Api\Data\ProductInterface $product,
@@ -217,6 +221,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
* @param \Magento\Bundle\Api\Data\LinkInterface $firstLink
* @param \Magento\Bundle\Api\Data\LinkInterface $secondLink
* @return int
+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
*/
private function compareLinks(
\Magento\Bundle\Api\Data\LinkInterface $firstLink,
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index f09394f5841..371dd863284 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -10,6 +10,7 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
/**
* Bundle Price Model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Price extends \Magento\Catalog\Model\Product\Type\Price
{
@@ -73,6 +74,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
* Is min/max prices have been calculated by index
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsPricesCalculatedByIndex()
{
@@ -180,6 +182,9 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
* @param bool|null $includeTax
* @param bool $takeTierPrice
* @return float|array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getTotalPrices($product, $which = null, $includeTax = null, $takeTierPrice = true)
{
@@ -522,6 +527,8 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
* @param float $qty
* @param \Magento\Catalog\Model\Product $product
* @return float|array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getTierPrice($qty, $product)
{
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index adcd9dd07f4..b4d55aeaf03 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -9,6 +9,9 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
/**
* Bundle Type Model
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
{
@@ -340,6 +343,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return $this|void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function beforeSave($product)
{
@@ -384,6 +388,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function save($product)
{
@@ -590,6 +595,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function isSalable($product)
{
@@ -648,6 +655,9 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Catalog\Model\Product $product
* @param string $processMode
* @return array|string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $product, $processMode)
{
@@ -1013,6 +1023,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return boolean true
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getForceChildItemQtyChanges($product)
{
diff --git a/app/code/Magento/Bundle/Model/Resource/Indexer/Price.php b/app/code/Magento/Bundle/Model/Resource/Indexer/Price.php
index d0b93651571..82b76add2e1 100644
--- a/app/code/Magento/Bundle/Model/Resource/Indexer/Price.php
+++ b/app/code/Magento/Bundle/Model/Resource/Indexer/Price.php
@@ -124,6 +124,7 @@ class Price extends \Magento\Catalog\Model\Resource\Product\Indexer\Price\Defaul
* @param int $priceType
* @param int|array $entityIds the entity ids limitation
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareBundlePriceByType($priceType, $entityIds = null)
{
@@ -372,6 +373,7 @@ class Price extends \Magento\Catalog\Model\Resource\Product\Indexer\Price\Defaul
*
* @param int $priceType
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _calculateBundleSelectionPrice($priceType)
{
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
index 70d75128ed9..f5168ba0f13 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -53,6 +53,7 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
*
* @param \Magento\Framework\Object $item
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isShipmentSeparately($item = null)
{
@@ -90,6 +91,7 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
*
* @param \Magento\Framework\Object $item
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isChildCalculated($item = null)
{
@@ -129,6 +131,7 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
*
* @param \Magento\Framework\Object $item
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getBundleOptions($item = null)
{
@@ -163,6 +166,7 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
*
* @param \Magento\Framework\Object $item
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getOrderOptions($item = null)
{
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
index 716ebb19e28..9c28d73b542 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -55,6 +55,9 @@ class Creditmemo extends AbstractItems
* Draw item line
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function draw()
{
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
index 6a6c5df32c2..6ee362083a2 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -53,6 +53,9 @@ class Invoice extends AbstractItems
* Draw item line
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function draw()
{
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
index a79b5f334e8..a07b1ad399c 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
@@ -53,6 +53,9 @@ class Shipment extends AbstractItems
* Draw item line
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function draw()
{
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index e15bbbf89f1..411ac7cf445 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -19,6 +19,7 @@ use Magento\Tax\Helper\Data as TaxHelper;
/**
* Bundle price calculator
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Calculator implements BundleCalculatorInterface
{
@@ -171,6 +172,8 @@ class Calculator implements BundleCalculatorInterface
* @param bool $searchMin
* @param bool $useRegularPrice
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function getSelectionAmounts(Product $bundleProduct, $searchMin, $useRegularPrice = false)
{
@@ -294,6 +297,7 @@ class Calculator implements BundleCalculatorInterface
* @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
* @param null|string $exclude
* @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
{
@@ -381,6 +385,7 @@ class Calculator implements BundleCalculatorInterface
* @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
* @param bool $searchMin
* @return \Magento\Bundle\Pricing\Price\BundleSelectionPrice[]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function processOptions($option, $selectionPriceList, $searchMin = true)
{
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
index 4868f3b0942..1a07e673dfe 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
@@ -15,6 +15,7 @@ use Magento\Framework\Pricing\Price\AbstractPrice;
/**
* Bundle option price
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class BundleSelectionPrice extends AbstractPrice
{
diff --git a/app/code/Magento/Captcha/Model/Observer.php b/app/code/Magento/Captcha/Model/Observer.php
index f334e578863..7ec17bedb4a 100644
--- a/app/code/Magento/Captcha/Model/Observer.php
+++ b/app/code/Magento/Captcha/Model/Observer.php
@@ -8,6 +8,7 @@ namespace Magento\Captcha\Model;
* Captcha Observer
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Observer
{
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryTreeInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryTreeInterface.php
index 8e2cb5cb78e..4532afab168 100644
--- a/app/code/Magento/Catalog/Api/Data/CategoryTreeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategoryTreeInterface.php
@@ -31,6 +31,7 @@ interface CategoryTreeInterface extends \Magento\Framework\Api\ExtensibleDataInt
* Check whether category is active
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsActive();
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php
index 537db1700cf..9a2d46c4efc 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php
@@ -40,6 +40,7 @@ interface ProductAttributeMediaGalleryEntryInterface
* Check if gallery entry is hidden from product page
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsDisabled();
diff --git a/app/code/Magento/Catalog/Api/Data/ProductCustomOptionInterface.php b/app/code/Magento/Catalog/Api/Data/ProductCustomOptionInterface.php
index 86125492a09..eb7d45d8a74 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductCustomOptionInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductCustomOptionInterface.php
@@ -46,6 +46,7 @@ interface ProductCustomOptionInterface
* Get is require
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsRequire();
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
index 8746bd4877e..4bd02b18ea4 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
@@ -120,6 +120,7 @@ class AbstractCategory extends \Magento\Backend\Block\Template
* @param mixed|null $parentNodeCategory
* @param int $recursionLevel
* @return Node|array|null
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getRoot($parentNodeCategory = null, $recursionLevel = 3)
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
index d4cc60d6737..6691d009d3e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
@@ -77,6 +77,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\Tree
* @param array|Node $node
* @param int $level
* @return array
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getNodeJson($node, $level = 1)
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
index a781811ee27..eeba03efc17 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
@@ -37,6 +37,8 @@ class Attributes extends \Magento\Backend\Block\Widget\Form\Generic
* Prepare form before rendering HTML
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Design.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Design.php
index 9a901923e75..dac119fad15 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Design.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Design.php
@@ -4,6 +4,9 @@
*/
namespace Magento\Catalog\Block\Adminhtml\Category\Tab;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Design extends \Magento\Catalog\Block\Adminhtml\Form
{
/**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tabs.php
index 9b6b4b9d346..43fd8b23a33 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tabs.php
@@ -105,6 +105,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
* Prepare Layout Content
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index e319dda2ba4..9abf8ed3f23 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -243,6 +243,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsWasExpanded()
{
@@ -313,6 +314,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
* @param Node|array $node
* @param int $level
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getNodeJson($node, $level = 0)
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
index b272634701a..f7ed33a771c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
@@ -18,6 +18,7 @@ class DateFieldsOrder extends Field
/**
* @param AbstractElement $element
* @return string
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getElementHtml(AbstractElement $element)
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
index 1f9429e665f..f23a32cfe17 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
@@ -137,6 +137,7 @@ HTML;
* Check whether wysiwyg enabled or not
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsWysiwygEnabled()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index 2656c10bad1..a266bae27ad 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -53,6 +53,7 @@ class Advanced extends Generic
* Adding product form elements for editing attribute
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
index 8d5b5c381a0..c11210b5a23 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
@@ -43,6 +43,7 @@ class Front extends Generic
/**
* {@inheritdoc}
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
index e6a7ed15573..756e349ac2a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
@@ -12,12 +12,16 @@ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
use Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Main extends AbstractMain
{
/**
* Adding product form elements for editing attribute
*
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
index e9a41e8d5c4..a72836ae05a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
@@ -12,6 +12,9 @@ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute;
use Magento\Eav\Block\Adminhtml\Attribute\Grid\AbstractGrid;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Grid extends AbstractGrid
{
/**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
index a284ea76329..9c71bb5a2ab 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
@@ -12,6 +12,9 @@ namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\NewAttribute\Product
use Magento\Backend\Block\Widget\Form;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Attributes extends \Magento\Catalog\Block\Adminhtml\Form
{
/**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 5aebe3f200c..327b1f7ce34 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -344,6 +344,7 @@ class Main extends \Magento\Backend\Block\Template
* Check Current Attribute Set is a default
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsCurrentSetDefault()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index 6735b2ab3bb..7dd12041a74 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -12,6 +12,9 @@ namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
use Magento\Framework\Data\Form\Element\AbstractElement;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Attributes extends \Magento\Catalog\Block\Adminhtml\Form implements
\Magento\Backend\Block\Widget\Tab\TabInterface
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
index 5583ece4863..1dc83ff4138 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
@@ -10,12 +10,18 @@
*/
namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Attributes extends \Magento\Catalog\Block\Adminhtml\Form
{
/**
* Prepare attributes form
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index 76549407ee7..e57ef20ab46 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -14,6 +14,9 @@ use Magento\Backend\Block\Widget\Grid\Column;
use Magento\Backend\Block\Widget\Grid\Extended;
use Magento\Catalog\Model\Product;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Crosssell extends Extended
{
/**
@@ -186,6 +189,7 @@ class Crosssell extends Extended
* Add columns to grid
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareColumns()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 9f54bda5ea5..5850fc36e56 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -268,6 +268,9 @@ class Option extends Widget
/**
* @return \Magento\Framework\Object[]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getOptionValues()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
index 1b6cfb40b16..964444d98c6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
@@ -12,6 +12,9 @@ namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Popup;
use Magento\Catalog\Model\Product;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
{
/**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
index 5b5d7bd8496..aedefddcfaa 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
@@ -42,6 +42,7 @@ class Tier extends Group\AbstractGroup
* @param array $a
* @param array $b
* @return int
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _sortTierPrices($a, $b)
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index 366dd7aa165..e6817d33ed0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -183,6 +183,7 @@ class Related extends Extended
* Add columns to grid
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareColumns()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index 655c2d4ad53..336cefd6dcd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -180,6 +180,7 @@ class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
* Add columns to grid
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareColumns()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
index d08324c0c2d..8df4d4dc70a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
@@ -71,6 +71,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Translate\InlineInterface $translateInline
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
@@ -117,6 +118,9 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
/**
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
index 200561aa8dc..69b12be65f6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
@@ -125,6 +125,7 @@ class Watermark extends \Magento\Backend\Block\AbstractBlock implements
/**
* @param AbstractElement $element
* @return string
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _getHeaderHtml($element)
{
@@ -148,6 +149,7 @@ class Watermark extends \Magento\Backend\Block\AbstractBlock implements
/**
* @param AbstractElement $element
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getFooterHtml($element)
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
index c84778729a2..d160dea8dcf 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
@@ -208,6 +208,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareColumns()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index 8b6d28dc947..c62ed8ef09f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -175,6 +175,7 @@ class Gallery extends AbstractElement
*
* @param Attribute|string $attribute
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getAttributeReadonly($attribute)
{
diff --git a/app/code/Magento/Catalog/Block/Navigation.php b/app/code/Magento/Catalog/Block/Navigation.php
index ed8f5d99d57..1a2e92a38c8 100644
--- a/app/code/Magento/Catalog/Block/Navigation.php
+++ b/app/code/Magento/Catalog/Block/Navigation.php
@@ -11,6 +11,7 @@ use Magento\Customer\Model\Context;
* Catalog navigation
*
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Navigation extends \Magento\Framework\View\Element\Template implements \Magento\Framework\View\Block\IdentityInterface
{
@@ -270,6 +271,9 @@ class Navigation extends \Magento\Framework\View\Element\Template implements \Ma
* @param string $childrenWrapClass If specified wraps children list in div with this class
* @param boolean $noEventAttributes Whether ot not to add on* attributes to list item
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _renderCategoryMenuItemHtml(
$category,
diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
index e4ef6689299..66f8e84c722 100644
--- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
@@ -6,6 +6,8 @@ namespace Magento\Catalog\Block\Product;
/**
* Class AbstractProduct
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class AbstractProduct extends \Magento\Framework\View\Element\Template
{
@@ -376,6 +378,7 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
*
* @param \Magento\Catalog\Model\Product $product
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCanShowProductPrice($product)
{
diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
index ad87e805056..fbdaa39bbb7 100644
--- a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -11,6 +11,7 @@ use Magento\Framework\App\Action\Action;
/**
* Catalog products compare block
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ListCompare extends \Magento\Catalog\Block\Product\Compare\AbstractCompare
{
diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
index 14ae9729f3e..573c8e5e8f5 100644
--- a/app/code/Magento/Catalog/Block/Product/Context.php
+++ b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -6,6 +6,7 @@ namespace Magento\Catalog\Block\Product;
/**
* Abstract product block context
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Context extends \Magento\Framework\View\Element\Template\Context
{
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 8628f008d12..2439810ea81 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -14,6 +14,7 @@ use Magento\Framework\View\Block\IdentityInterface;
/**
* Product list
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ListProduct extends AbstractProduct implements IdentityInterface
{
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 98d0ba28ab7..ebac80d1bbb 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -11,6 +11,7 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
* Product list toolbar
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class Toolbar extends \Magento\Framework\View\Element\Template
{
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index 18ef7c70cc9..ee82d0c10c5 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -72,6 +72,7 @@ class View extends AbstractProduct implements \Magento\Framework\View\Block\Iden
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param array $data
* @codingStandardsIgnoreStart
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Catalog\Block\Product\Context $context,
diff --git a/app/code/Magento/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
index 9828e2ea95e..96922f7f548 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
@@ -66,6 +66,7 @@ class Attributes extends \Magento\Framework\View\Element\Template
*
* @param array $excludeAttr
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getAdditionalData(array $excludeAttr = [])
{
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index 27280fb2b3f..a9e0c0d20cc 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -37,6 +37,9 @@ class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
* Return html for control element
*
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getValuesHtml()
{
diff --git a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php
index 09ba8338cdf..db0c35a5a74 100644
--- a/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php
+++ b/app/code/Magento/Catalog/Block/Product/Widget/Html/Pager.php
@@ -151,6 +151,7 @@ class Pager extends \Magento\Theme\Block\Html\Pager
* Return number of last page
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getLastPageNum()
{
diff --git a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
index 1f2db4b0951..6303f6a2678 100644
--- a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
+++ b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
@@ -196,6 +196,7 @@ class NewWidget extends \Magento\Catalog\Block\Product\NewProduct implements \Ma
* @param string $renderZone
* @param array $arguments
* @return string
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getProductPriceHtml(
\Magento\Catalog\Model\Product $product,
diff --git a/app/code/Magento/Catalog/Block/Rss/Category.php b/app/code/Magento/Catalog/Block/Rss/Category.php
index 7000804947e..4d43e003100 100644
--- a/app/code/Magento/Catalog/Block/Rss/Category.php
+++ b/app/code/Magento/Catalog/Block/Rss/Category.php
@@ -11,6 +11,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
/**
* Class Category
* @package Magento\Catalog\Block\Rss
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Category extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
{
@@ -60,6 +61,7 @@ class Category extends \Magento\Framework\View\Element\AbstractBlock implements
* @param \Magento\Customer\Model\Session $customerSession
* @param CategoryRepositoryInterface $categoryRepository
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
index 50292baecd4..e5177a0258a 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -10,6 +10,7 @@ use Magento\Framework\App\Rss\DataProviderInterface;
/**
* Class Special
* @package Magento\Catalog\Block\Rss\Product
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Special extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
{
diff --git a/app/code/Magento/Catalog/Block/Widget/Link.php b/app/code/Magento/Catalog/Block/Widget/Link.php
index 40ffefb24c7..a710ff7e89c 100644
--- a/app/code/Magento/Catalog/Block/Widget/Link.php
+++ b/app/code/Magento/Catalog/Block/Widget/Link.php
@@ -66,6 +66,7 @@ class Link extends \Magento\Framework\View\Element\Html\Link implements \Magento
*
* @throws \RuntimeException
* @return string|false
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getHref()
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
index f17bfc3abd5..34b10d7aa41 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
@@ -38,6 +38,8 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Category
* Edit category page
*
* @return \Magento\Framework\Controller\ResultInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index 5e470317e2b..7f945b6560b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -67,6 +67,9 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category
* Category save
*
* @return \Magento\Framework\Controller\ResultInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function execute()
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
index ea70e943db4..f5366e406fa 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
@@ -8,6 +8,7 @@ use Magento\Backend\App\Action;
/**
* Catalog product controller
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Product extends \Magento\Backend\App\Action
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 963160cf04e..ad634300ea2 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -9,6 +9,7 @@ use Magento\Backend\App\Action;
/**
* Class Save
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
{
@@ -79,6 +80,9 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
* Update product attributes
*
* @return \Magento\Backend\Model\View\Result\Redirect
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function execute()
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
index 2deca24d3a9..c354b28c08f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Edit.php
@@ -38,6 +38,7 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
/**
* @return \Magento\Framework\Controller\ResultInterface
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index be7c060d361..c9875cf4773 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -7,6 +7,9 @@ namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
use Magento\Catalog\Model\Product\AttributeSet\AlreadyExistsException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
{
/**
@@ -56,6 +59,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
* @param \Magento\Catalog\Helper\Product $productHelper
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
@@ -82,6 +86,9 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
/**
* @return \Magento\Backend\Model\View\Result\Redirect
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function execute()
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index 98dd712429b..f100d96a9f1 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -57,6 +57,8 @@ class Helper
*
* @param \Magento\Catalog\Model\Product $product
* @return \Magento\Catalog\Model\Product
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function initialize(\Magento\Catalog\Model\Product $product)
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php
index 46ecff533cf..f4601804736 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/StockDataFilter.php
@@ -44,6 +44,7 @@ class StockDataFilter
*
* @param array $stockData
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function filter(array $stockData)
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index 7dc0df9dbae..04f9e4857d6 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -57,6 +57,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
* Save product action
*
* @return \Magento\Backend\Model\View\Result\Redirect
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
index aa7d6c6d182..da219e891f0 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
@@ -62,6 +62,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set
* [AJAX] Save attribute set data
*
* @return \Magento\Framework\Controller\ResultInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
index 45cf6c67cf6..dc99ceeef93 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
@@ -57,6 +57,8 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product
* Validate product
*
* @return \Magento\Framework\Controller\Result\JSON
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index d6db2447de5..ecc35c2a66d 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -10,6 +10,9 @@ use Magento\Catalog\Model\Layer\Resolver;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\View\Result\PageFactory;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class View extends \Magento\Framework\App\Action\Action
{
/**
@@ -134,6 +137,8 @@ class View extends \Magento\Framework\App\Action\Action
* Category view action
*
* @return \Magento\Framework\View\Result\Page
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare.php b/app/code/Magento/Catalog/Controller/Product/Compare.php
index a5690060e2a..c8cc5ffde72 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare.php
@@ -13,6 +13,7 @@ use Magento\Framework\View\Result\PageFactory;
* Catalog compare controller
*
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Compare extends \Magento\Framework\App\Action\Action
{
@@ -105,6 +106,7 @@ class Compare extends \Magento\Framework\App\Action\Action
* @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
* @param ProductRepositoryInterface $productRepository
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index 60700d40757..896ce44b351 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -10,6 +10,9 @@ use Magento\Core\App\Action\FormKeyValidator;
use Magento\Framework\Controller\Result;
use Magento\Framework\View\Result\PageFactory;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Index extends \Magento\Catalog\Controller\Product\Compare
{
/**
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index 3c1f489aa1f..adafe60cc3a 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -14,6 +14,8 @@ use Magento\Tax\Model\Config;
/**
* Catalog data helper
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
@@ -183,6 +185,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param PriceCurrencyInterface $priceCurrency
* @param ProductRepositoryInterface $productRepository
* @param CategoryRepositoryInterface $categoryRepository
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
@@ -463,6 +466,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param bool $priceIncludesTax flag what price parameter contain tax
* @param bool $roundPrice
* @return float
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getTaxPrice(
$product,
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index e232b7280a7..15358582c72 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -248,6 +248,7 @@ class Image extends AbstractHelper
* @param bool $flag
* @param string[] $position
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function keepFrame($flag, $position = ['center', 'middle'])
{
@@ -266,6 +267,7 @@ class Image extends AbstractHelper
* @param bool $flag
* @param int $alphaOpacity
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function keepTransparency($flag, $alphaOpacity = null)
{
diff --git a/app/code/Magento/Catalog/Helper/Output.php b/app/code/Magento/Catalog/Helper/Output.php
index 3d5bd36819a..36586a78721 100644
--- a/app/code/Magento/Catalog/Helper/Output.php
+++ b/app/code/Magento/Catalog/Helper/Output.php
@@ -132,6 +132,7 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
* @param string $attributeHtml
* @param string $attributeName
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function productAttribute($product, $attributeHtml, $attributeName)
{
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
index b26f922a2ab..ecc2a3c48d1 100644
--- a/app/code/Magento/Catalog/Helper/Product.php
+++ b/app/code/Magento/Catalog/Helper/Product.php
@@ -12,6 +12,7 @@ use Magento\Store\Model\Store;
/**
* Catalog category helper
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Product extends \Magento\Core\Helper\Url
{
@@ -109,6 +110,7 @@ class Product extends \Magento\Core\Helper\Url
* @param array $reindexPriceIndexerData
* @param ProductRepositoryInterface $productRepository
* @param CategoryRepositoryInterface $categoryRepository
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
@@ -245,6 +247,7 @@ class Product extends \Magento\Core\Helper\Url
*
* @param ModelProduct|\Magento\Framework\Object $product
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getThumbnailUrl($product)
{
@@ -283,6 +286,7 @@ class Product extends \Magento\Core\Helper\Url
* @param ModelProduct|int $product
* @param string $where
* @return boolean
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function canShow($product, $where = 'catalog')
{
@@ -384,6 +388,8 @@ class Product extends \Magento\Core\Helper\Url
* @param \Magento\Framework\Object $params
*
* @return false|ModelProduct
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function initProduct($productId, $controller, $params = null)
{
@@ -537,6 +543,7 @@ class Product extends \Magento\Core\Helper\Url
* Get flag that shows if Magento has to check product to be saleable (enabled and/or inStock)
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getSkipSaleableCheck()
{
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index d762ef438dd..206d47e249e 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -11,6 +11,7 @@ use Magento\Catalog\Model\Resource\Product\Compare\Item\Collection;
* Catalog Product Compare Helper
*
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Compare extends \Magento\Core\Helper\Url
{
@@ -103,6 +104,7 @@ class Compare extends \Magento\Core\Helper\Url
* @param \Magento\Framework\Data\Form\FormKey $formKey
* @param \Magento\Wishlist\Helper\Data $wishlistHelper
* @param \Magento\Core\Helper\PostData $coreHelper
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
@@ -356,6 +358,7 @@ class Compare extends \Magento\Core\Helper\Url
* Retrieve is allow used flat (for collection)
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getAllowUsedFlat()
{
diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php
index 6a5dc498067..7618b1596af 100644
--- a/app/code/Magento/Catalog/Helper/Product/Composite.php
+++ b/app/code/Magento/Catalog/Helper/Product/Composite.php
@@ -18,6 +18,7 @@ use Magento\Framework\Registry;
* Adminhtml catalog product composite helper
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Composite extends \Magento\Framework\App\Helper\AbstractHelper
{
diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration.php b/app/code/Magento/Catalog/Helper/Product/Configuration.php
index 6a818dc1e20..bead7f43f41 100644
--- a/app/code/Magento/Catalog/Helper/Product/Configuration.php
+++ b/app/code/Magento/Catalog/Helper/Product/Configuration.php
@@ -144,6 +144,8 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
* - 'cutReplacer': replacer for cut off value part when option value exceeds maxLength
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getFormattedOptionValue($optionValue, $params = null)
{
diff --git a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index 8a6c156fa3f..172cbacd77d 100644
--- a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -10,6 +10,7 @@ namespace Magento\Catalog\Helper\Product\Edit\Action;
/**
* Class Attribute
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Attribute extends \Magento\Backend\Helper\Data
{
@@ -66,6 +67,7 @@ class Attribute extends \Magento\Backend\Helper\Data
* @param \Magento\Backend\Model\Session $session
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
index e029df6c439..0d3e46a469d 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
@@ -7,6 +7,8 @@ namespace Magento\Catalog\Helper\Product\Flat;
/**
* Catalog Product Flat Indexer Helper
*
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
{
@@ -129,6 +131,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
* @param bool $addFilterableAttrs
* @param bool $addChildData
* @param array $flatAttributeGroups
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 1973e8fbf09..d7852e1a83f 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -101,6 +101,8 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Catalog\Model\Product $product
* @param null|\Magento\Framework\Object $params
* @return \Magento\Catalog\Helper\Product\View
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function initProductLayout(ResultPage $resultPage, $product, $params = null)
{
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 168813ce8f6..23a47db8f11 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -312,6 +312,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
*
* @param string $attributeCode
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getExistsStoreValueFlag($attributeCode)
{
diff --git a/app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php b/app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php
index 7da58daf9e8..18dacad31ee 100644
--- a/app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php
@@ -47,6 +47,7 @@ class ContextPlugin
* @param callable $proceed
* @param \Magento\Framework\App\RequestInterface $request
* @return mixed
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundDispatch(
\Magento\Framework\App\Action\Action $subject,
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 7d13628710b..1fc360af70f 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -26,6 +26,10 @@ use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
* @method Category setUrlPath(string $urlPath)
*
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Category extends \Magento\Catalog\Model\AbstractModel implements
\Magento\Framework\Object\IdentityInterface,
@@ -189,6 +193,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -256,6 +261,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
* Get flat resource model flag
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseFlatResource()
{
@@ -407,6 +413,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
* @param bool $noDesignAttributes
* @return array
* @todo Use with Flat Resource
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getAttributes($noDesignAttributes = false)
{
@@ -1092,6 +1099,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsActive()
{
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index c4372b1b1d0..15c8e1374b7 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -34,6 +34,8 @@ class Sortby extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
* @param \Magento\Framework\Object $object
* @return bool
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validate($object)
{
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index 3641dacd74f..c952319dd55 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -6,6 +6,8 @@ namespace Magento\Catalog\Model;
/**
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Config extends \Magento\Eav\Model\Config
{
diff --git a/app/code/Magento/Catalog/Model/Entity/Attribute.php b/app/code/Magento/Catalog/Model/Entity/Attribute.php
index e1e07eb8fe8..09e7fa2da41 100644
--- a/app/code/Magento/Catalog/Model/Entity/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Entity/Attribute.php
@@ -42,6 +42,7 @@ use Magento\Framework\Api\AttributeDataBuilder;
* @method \Magento\Catalog\Model\Entity\Attribute setIsWysiwygEnabled(int $value)
* @method int getIsUsedForPromoRules()
* @method \Magento\Catalog\Model\Entity\Attribute setIsUsedForPromoRules(int $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Attribute extends \Magento\Eav\Model\Entity\Attribute
{
@@ -85,6 +86,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/AffectCache.php b/app/code/Magento/Catalog/Model/Indexer/Category/AffectCache.php
index 3858eb94fb0..3fa35baa61c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/AffectCache.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/AffectCache.php
@@ -28,6 +28,7 @@ class AffectCache
* @param \Magento\Indexer\Model\ActionInterface $subject
* @param array $ids
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function beforeExecute(\Magento\Indexer\Model\ActionInterface $subject, $ids)
{
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index 36d1e6d8ff1..a3d2ef62ea8 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -185,6 +185,7 @@ class AbstractAction
* Return array of static columns
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function getStaticColumns()
{
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
index 86e060834d5..9c49984e040 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
@@ -22,6 +22,7 @@ class StoreGroup
* @param callable $proceed
* @param \Magento\Framework\Model\AbstractModel $group
* @return mixed
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundSave(
\Magento\Framework\Model\Resource\Db\AbstractDb $subject,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/AffectCache.php b/app/code/Magento/Catalog/Model/Indexer/Product/AffectCache.php
index ea50c8e0cd8..2ecfb96c200 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/AffectCache.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/AffectCache.php
@@ -28,6 +28,7 @@ class AffectCache
* @param \Magento\Indexer\Model\ActionInterface $subject
* @param array $ids
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function beforeExecute(\Magento\Indexer\Model\ActionInterface $subject, $ids)
{
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
index 3cf1f0e15b7..c9d10aea74e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -117,6 +117,7 @@ abstract class AbstractAction
* @param array $tablesList
* @param int|string $storeId
* @return void
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _cleanOnFailure(array $tablesList, $storeId)
{
@@ -182,6 +183,7 @@ abstract class AbstractAction
* @param int $storeId
* @param int|array $productIds Update child product(s) only
* @return \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _updateRelationProducts($storeId, $productIds = null)
{
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
index 6f5911abbcf..893d6974a7e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -40,6 +40,8 @@ class Indexer
* @param int $productId
* @param string $valueFieldSuffix
* @return \Magento\Catalog\Model\Indexer\Product\Flat
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function write($storeId, $productId, $valueFieldSuffix = '')
{
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index deaa8d99049..d8a86e5a3df 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -97,6 +97,8 @@ class FlatTableBuilder
* @param int|string $storeId
* @return void
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _createTemporaryFlatTable($storeId)
{
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index dbde7ffb868..891576e0269 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -7,6 +7,7 @@ namespace Magento\Catalog\Model\Indexer\Product\Price;
/**
* Abstract action reindex class
*
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractAction
{
@@ -443,6 +444,7 @@ abstract class AbstractAction
*
* @param array $changedIds
* @return array Affected ids
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _reindexRows($changedIds = [])
{
diff --git a/app/code/Magento/Catalog/Model/Layer.php b/app/code/Magento/Catalog/Model/Layer.php
index 64290646cd6..7f840567799 100644
--- a/app/code/Magento/Catalog/Model/Layer.php
+++ b/app/code/Magento/Catalog/Model/Layer.php
@@ -11,6 +11,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
* Catalog view layer model
*
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Layer extends \Magento\Framework\Object
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php
index 1020640c934..57b7981e013 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Auto.php
@@ -12,6 +12,9 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Registry;
use Magento\Framework\Search\Dynamic\Algorithm;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Auto implements AlgorithmInterface
{
const MIN_RANGE_POWER = 10;
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index 2ac5447502c..30502703baa 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -8,6 +8,7 @@ namespace Magento\Catalog\Model\Layer\Filter;
* Layer price filter
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
{
@@ -69,6 +70,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
* @param Dynamic\AlgorithmFactory $algorithmFactory
* @param DataProvider\PriceFactory $dataProviderFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index b26ffe5bdcf..095b707d217 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -28,6 +28,10 @@ use Magento\Framework\Pricing\Object\SaleableInterface;
* @method Product setRequestPath(string $requestPath)
*
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Product extends \Magento\Catalog\Model\AbstractModel implements
IdentityInterface,
@@ -639,6 +643,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
* @param int $groupId Retrieve attributes of the specified group
* @param bool $skipSuper Not used
* @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getAttributes($groupId = null, $skipSuper = false)
{
@@ -661,6 +666,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
* Check product options and type options and save them, too
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function beforeSave()
{
@@ -1392,6 +1398,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
* Is product salable detecting by product type
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsSalable()
{
@@ -1678,6 +1685,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
* Retrieve is a virtual product
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsVirtual()
{
diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php
index 6cbd2373eed..f978227925c 100644
--- a/app/code/Magento/Catalog/Model/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/Product/Action.php
@@ -116,6 +116,7 @@ class Action extends \Magento\Framework\Model\AbstractModel
*
* @param array $attributesData
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _hasIndexableAttributes($attributesData)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php
index 157545a285e..2f07f6ea542 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php
@@ -108,6 +108,7 @@ abstract class AbstractGroupprice extends Price
*
* @param array $objectArray
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getAdditionalUniqueFields($objectArray)
{
@@ -131,6 +132,8 @@ abstract class AbstractGroupprice extends Price
* @param \Magento\Catalog\Model\Product $object
* @throws \Magento\Framework\Model\Exception
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validate($object)
{
@@ -283,6 +286,9 @@ abstract class AbstractGroupprice extends Price
*
* @param \Magento\Catalog\Model\Product $object
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function afterSave($object)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
index 956447517a5..73b845d5b71 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -13,6 +13,10 @@ namespace Magento\Catalog\Model\Product\Attribute\Backend;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Model\Exception;
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
/**
@@ -163,6 +167,8 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
/**
* @param \Magento\Framework\Object $object
* @return $this|void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function beforeSave($object)
{
@@ -253,6 +259,8 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
/**
* @param \Magento\Framework\Object $object
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function afterSave($object)
{
@@ -346,6 +354,8 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
* @param boolean $exclude mark image as disabled in product page view
* @return string
* @throws Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addImage(
\Magento\Catalog\Model\Product $product,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
index 545f93426d2..38a8019b837 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -95,6 +95,7 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
*
* @param \Magento\Catalog\Model\Product $object
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function afterSave($object)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php b/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
index 40ebe17214d..5aff918f971 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Repository.php
@@ -8,6 +8,9 @@ namespace Magento\Catalog\Model\Product\Attribute;
use Magento\Framework\Exception\InputException;
use Magento\Framework\Exception\NoSuchEntityException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInterface
{
/**
@@ -71,6 +74,7 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
* @param \Magento\Framework\Api\Config\MetadataConfig $metadataConfig
* @param \Magento\Framework\Api\SearchCriteriaDataBuilder $searchCriteriaBuilder
* @param \Magento\Framework\Api\FilterBuilder $filterBuilder
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Catalog\Model\Resource\Attribute $attributeResource,
@@ -120,6 +124,8 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
index 0275c94f307..b47b04bbbba 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
@@ -38,6 +38,7 @@ class Inputtype extends \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputt
* Get product input types as option array
*
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function toOptionArray()
{
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
index e63ab56b208..eab5830cc48 100644
--- a/app/code/Magento/Catalog/Model/Product/Compare/Item.php
+++ b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
@@ -206,6 +206,7 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function bindCustomerLogout(\Magento\Framework\Event\Observer $observer = null)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php b/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php
index 3b04efcf19b..72830eaa06b 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php
@@ -45,6 +45,7 @@ class Entry extends \Magento\Framework\Model\AbstractExtensibleModel implements
* Check if gallery entry is hidden from product page
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsDisabled()
{
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index 6e46c6472e2..deb76aea5d4 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -14,6 +14,9 @@ use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Exception\StateException;
use Magento\Framework\App\Filesystem\DirectoryList;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface
{
/**
diff --git a/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php b/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
index 0a39a50e69f..20eb8a3d864 100644
--- a/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
@@ -68,6 +68,8 @@ class GroupPriceManagement implements \Magento\Catalog\Api\ProductGroupPriceMana
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function add($productSku, $customerGroupId, $price)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index fbb66e6b0b9..1d69922c240 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -14,6 +14,11 @@ use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Image as MagentoImage;
use Magento\Store\Model\Store;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Image extends \Magento\Framework\Model\AbstractModel
{
/**
@@ -173,6 +178,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -380,6 +387,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
/**
* @param string|null $file
* @return float|int
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getNeedMemoryForFile($file = null)
{
@@ -435,6 +443,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
* @param string $file
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function setBaseFile($file)
{
@@ -610,6 +620,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
* @param int $height
* @param int $opacity
* @return $this
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function setWatermark(
$file,
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index 9311b734426..cdc0c608ba6 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -21,6 +21,7 @@ use Magento\Framework\Model\Exception;
* @method \Magento\Catalog\Model\Product\Option setProductId(int $value)
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Option extends AbstractExtensibleModel implements \Magento\Catalog\Api\Data\ProductCustomOptionInterface
{
@@ -103,6 +104,7 @@ class Option extends AbstractExtensibleModel implements \Magento\Catalog\Api\Dat
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -312,6 +314,7 @@ class Option extends AbstractExtensibleModel implements \Magento\Catalog\Api\Dat
* Save options.
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function saveOptions()
{
@@ -625,6 +628,7 @@ class Option extends AbstractExtensibleModel implements \Magento\Catalog\Api\Dat
* Get is require
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsRequire()
{
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
index 3fc88c0b44b..79375a07041 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
@@ -43,6 +43,8 @@ class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
* @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validateUserValue($values)
{
@@ -116,6 +118,8 @@ class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
*
* @return string|null Prepared option value
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function prepareForCart()
{
@@ -174,6 +178,7 @@ class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
*
* @param string $optionValue Prepared for cart option value
* @return string
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getFormattedOptionValue($optionValue)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 6a42182e7b0..76a465081d4 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -10,6 +10,7 @@ use Magento\Framework\Model\Exception;
* Catalog product option default type
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class DefaultType extends \Magento\Framework\Object
{
@@ -215,6 +216,7 @@ class DefaultType extends \Magento\Framework\Object
* Check skip required option validation
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getSkipCheckRequiredOption()
{
@@ -297,6 +299,7 @@ class DefaultType extends \Magento\Framework\Object
* @param string $optionValue
* @param array $productOptionValues Values for product option
* @return string|null
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function parseOptionValue($optionValue, $productOptionValues)
{
@@ -320,6 +323,7 @@ class DefaultType extends \Magento\Framework\Object
* @param string $optionValue Prepared for cart option value
* @param float $basePrice For percent price type
* @return float
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getOptionPrice($optionValue, $basePrice)
{
@@ -334,6 +338,7 @@ class DefaultType extends \Magento\Framework\Object
* @param string $optionValue Prepared for cart option value
* @param string $skuDelimiter Delimiter for Sku parts
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getOptionSku($optionValue, $skuDelimiter)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
index e3ebe2cedf0..b50046bf3bd 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -11,6 +11,7 @@ use Magento\Framework\Model\Exception;
* Catalog product option file type
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
{
@@ -178,6 +179,7 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
* @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
* @return $this
* @throws Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function validateUserValue($values)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
index 8ddcbf00db9..d9af28723ba 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
@@ -8,6 +8,9 @@ namespace Magento\Catalog\Model\Product\Option\Type\File;
use Magento\Catalog\Model\Product;
use Magento\Framework\App\Filesystem\DirectoryList;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class ValidatorFile extends Validator
{
/**
@@ -86,6 +89,7 @@ class ValidatorFile extends Validator
* @return array
* @throws \Magento\Framework\Model\Exception
* @throws \Zend_File_Transfer_Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function validate($processingParams, $option)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
index 95dec4ea4f6..3c79ad4a14e 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
@@ -30,6 +30,8 @@ class Select extends DefaultValidator
*
* @param Option $option
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function validateOptionValue(Option $option)
{
diff --git a/app/code/Magento/Catalog/Model/Product/PriceModifier.php b/app/code/Magento/Catalog/Model/Product/PriceModifier.php
index e6b61b5dde7..e7f68876074 100644
--- a/app/code/Magento/Catalog/Model/Product/PriceModifier.php
+++ b/app/code/Magento/Catalog/Model/Product/PriceModifier.php
@@ -69,6 +69,7 @@ class PriceModifier
* @throws \Magento\Framework\Exception\NoSuchEntityException
* @throws \Magento\Framework\Exception\CouldNotSaveException
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function removeTierPrice(\Magento\Catalog\Model\Product $product, $customerGroupId, $qty, $websiteId)
{
diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
index a0b2ef64401..e561fa8f110 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
@@ -12,6 +12,9 @@ use Magento\Customer\Api\GroupRepositoryInterface;
use Magento\Framework\Exception\CouldNotSaveException;
use Magento\Framework\Exception\InputException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManagementInterface
{
/**
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index 1b9fcdff10f..1c173d2795c 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -9,6 +9,10 @@ use Magento\Framework\App\Filesystem\DirectoryList;
/**
* Abstract model for product type implementation
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractType
{
@@ -166,6 +170,7 @@ abstract class AbstractType
* @param \Magento\Framework\Registry $coreRegistry
* @param \Psr\Log\LoggerInterface $logger
* @param ProductRepositoryInterface $productRepository
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Catalog\Model\Product\Option $catalogProductOption,
@@ -224,6 +229,7 @@ abstract class AbstractType
* @param int $parentId
* @param bool $required
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getChildrenIds($parentId, $required = true)
{
@@ -235,6 +241,7 @@ abstract class AbstractType
*
* @param int|array $childId
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getParentIdsByChild($childId)
{
@@ -318,6 +325,7 @@ abstract class AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function isVirtual($product)
{
@@ -348,6 +356,7 @@ abstract class AbstractType
* @param \Magento\Catalog\Model\Product $product
* @param string $processMode
* @return array|string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $product, $processMode)
{
@@ -461,6 +470,8 @@ abstract class AbstractType
*
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function processFileQueue()
{
@@ -713,6 +724,7 @@ abstract class AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function isComposite($product)
{
@@ -724,6 +736,7 @@ abstract class AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function canConfigure($product)
{
@@ -827,6 +840,7 @@ abstract class AbstractType
* @param \Magento\Catalog\Model\Product $product
*
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function updateQtyOption($options, \Magento\Framework\Object $option, $value, $product)
{
@@ -879,6 +893,8 @@ abstract class AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return boolean false
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getForceChildItemQtyChanges($product)
{
@@ -891,6 +907,7 @@ abstract class AbstractType
* @param int|float $qty
* @param \Magento\Catalog\Model\Product $product
* @return float
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function prepareQuoteItemQty($qty, $product)
{
@@ -974,6 +991,7 @@ abstract class AbstractType
* @param \Magento\Catalog\Model\Product $product
* @param \Magento\Framework\Object $buyRequest
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function processBuyRequest($product, $buyRequest)
{
@@ -1027,6 +1045,7 @@ abstract class AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setImageFromChildProduct(\Magento\Catalog\Model\Product $product)
{
@@ -1038,6 +1057,7 @@ abstract class AbstractType
*
* @param \Magento\Catalog\Model\Product $product
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getIdentities(\Magento\Catalog\Model\Product $product)
{
@@ -1047,6 +1067,7 @@ abstract class AbstractType
/**
* @param \Magento\Catalog\Model\Product\Type\AbstractType $product
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getAssociatedProducts($product)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index d183d530ecc..5100305fcda 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -156,6 +156,7 @@ class Price
* @param Product $childProduct
* @param float $childProductQty
* @return float
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)
{
@@ -242,6 +243,8 @@ class Price
* @param Product $product
* @return float|array
* @deprecated (MAGETWO-31465)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getTierPrice($qty, $product)
{
@@ -409,6 +412,7 @@ class Price
* @param float $finalPrice
* @return float
* @deprecated (MAGETWO-31469)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _applyOptionsPrice($product, $qty, $finalPrice)
{
diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php
index 0a679bb7e5b..09a220ae3fa 100644
--- a/app/code/Magento/Catalog/Model/Product/Url.php
+++ b/app/code/Magento/Catalog/Model/Product/Url.php
@@ -157,6 +157,8 @@ class Url extends \Magento\Framework\Object
* @param \Magento\Catalog\Model\Product $product
* @param array $params
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getUrl(\Magento\Catalog\Model\Product $product, $params = [])
{
diff --git a/app/code/Magento/Catalog/Model/Product/Validator.php b/app/code/Magento/Catalog/Model/Product/Validator.php
index 9033f21f509..47ac5951c70 100644
--- a/app/code/Magento/Catalog/Model/Product/Validator.php
+++ b/app/code/Magento/Catalog/Model/Product/Validator.php
@@ -17,6 +17,7 @@ class Validator
* @param RequestInterface $request
* @param \Magento\Framework\Object $response
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validate(Product $product, RequestInterface $request, \Magento\Framework\Object $response)
{
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
index 10931b04a15..b92f454535a 100644
--- a/app/code/Magento/Catalog/Model/ProductRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -10,6 +10,9 @@ use Magento\Framework\Api\SearchCriteriaInterface;
use Magento\Framework\Api\SortOrder;
use Magento\Framework\Exception\NoSuchEntityException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterface
{
/**
diff --git a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
index cfeb545ae90..ecb67e61160 100644
--- a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
@@ -8,6 +8,7 @@ use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
/**
* Catalog entity abstract model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
{
@@ -531,6 +532,9 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
* @param int|string|array $attribute atrribute's ids or codes
* @param int|\Magento\Store\Model\Store $store
* @return bool|string|array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getAttributeRawValue($entityId, $attribute, $store)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Category.php b/app/code/Magento/Catalog/Model/Resource/Category.php
index 6eebb369d2b..7dfdc494991 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category.php
@@ -10,6 +10,9 @@
*/
namespace Magento\Catalog\Model\Resource;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Category extends AbstractResource
{
/**
@@ -325,6 +328,8 @@ class Category extends AbstractResource
*
* @param \Magento\Catalog\Model\Category $category
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _saveCategoryProducts($category)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Collection.php b/app/code/Magento/Catalog/Model/Resource/Category/Collection.php
index d219fd60332..db33f16fc64 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Collection.php
@@ -200,6 +200,8 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
* @param boolean $countRegular get product count for regular (non-anchor) categories
* @param boolean $countAnchor get product count for anchor categories
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function loadProductCount($items, $countRegular = true, $countAnchor = true)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
index 0aabf40c99e..2659ca7ac60 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
@@ -4,6 +4,9 @@
*/
namespace Magento\Catalog\Model\Resource\Category;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Tree extends \Magento\Framework\Data\Tree\Dbp
{
const ID_FIELD = 'id';
@@ -156,6 +159,8 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
* @param boolean $toLoad
* @param boolean $onlyActive
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addCollectionData(
$collection = null,
@@ -323,6 +328,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
*
* @param int $id
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
protected function _getItemIsActive($id)
{
@@ -436,6 +442,8 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
* @param bool $addCollectionData
* @param bool $updateAnchorProductCount
* @return $this|bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function loadByIds($ids, $addCollectionData = true, $updateAnchorProductCount = true)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
index 4b573832cd0..da3f8ce04f1 100644
--- a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
@@ -35,6 +35,7 @@ use Magento\Framework\Api\AttributeDataBuilder;
* @method int setIsUsedForPromoRules(int $value)
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
\Magento\Catalog\Api\Data\ProductAttributeInterface
@@ -112,6 +113,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -174,6 +176,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
*
* @return \Magento\Framework\Model\AbstractModel
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function beforeSave()
{
@@ -411,6 +414,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
* Check is an attribute used in EAV index
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isIndexable()
{
@@ -441,6 +445,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
* Is original attribute config indexable
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _isOriginalIndexable()
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Helper.php b/app/code/Magento/Catalog/Model/Resource/Helper.php
index ef2f15133bd..23d92bfaf59 100644
--- a/app/code/Magento/Catalog/Model/Resource/Helper.php
+++ b/app/code/Magento/Catalog/Model/Resource/Helper.php
@@ -29,6 +29,7 @@ class Helper extends \Magento\Eav\Model\Resource\Helper
* @param array $column
* @param array $describe
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function compareIndexColumnProperties($column, $describe)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product.php b/app/code/Magento/Catalog/Model/Resource/Product.php
index 5cdb5ec2ad7..ac205a6e705 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product.php
@@ -8,6 +8,7 @@ namespace Magento\Catalog\Model\Resource;
* Product entity resource model
*
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Product extends AbstractResource
{
@@ -310,6 +311,7 @@ class Product extends AbstractResource
*
* @param \Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _saveCategories(\Magento\Framework\Object $object)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
index 73b7c3cb603..cc0bb42dd95 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
@@ -12,6 +12,11 @@ use Magento\Store\Model\Store;
/**
* Product collection
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractCollection
{
@@ -1389,6 +1394,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
* @param array $condition
* @param string $joinType
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
{
@@ -1528,6 +1534,8 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
* @param string $attribute
* @param string $dir
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
{
@@ -1625,6 +1633,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
* Join website product limitation
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _productLimitationJoinWebsite()
{
@@ -1677,6 +1686,8 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
* Join additional (alternative) store visibility filter
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _productLimitationJoinStore()
{
@@ -1976,6 +1987,8 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
* Add tier price data to loaded items
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addTierPriceData()
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
index c82e9ed4d6f..16c66cc6115 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
@@ -9,6 +9,7 @@ namespace Magento\Catalog\Model\Resource\Product\Compare\Item;
*
* @author Magento Core Team <core@magentocommerce.com>
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php
index 5f30b32bc23..c5763f1ac0a 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php
@@ -109,6 +109,7 @@ class DefaultPrice extends \Magento\Catalog\Model\Resource\Product\Indexer\Abstr
* Check product type is composite
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsComposite()
{
@@ -202,6 +203,7 @@ class DefaultPrice extends \Magento\Catalog\Model\Resource\Product\Indexer\Abstr
*
* @param int|array $entityIds the entity ids limitation
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareFinalPriceData($entityIds = null)
{
@@ -390,6 +392,7 @@ class DefaultPrice extends \Magento\Catalog\Model\Resource\Product\Indexer\Abstr
* Apply custom option minimal and maximal price to temporary final price index table
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _applyCustomOption()
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Link.php b/app/code/Magento/Catalog/Model/Resource/Product/Link.php
index e2883afd0ba..799d804d8ed 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Link.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Link.php
@@ -53,6 +53,7 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param array $data
* @param int $typeId
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function saveProductLinks($product, $data, $typeId)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option.php b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
index 59dccbe862a..510ee1ac088 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
@@ -81,6 +81,8 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $object)
{
@@ -229,6 +231,7 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $object)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
index 088e77ed2e2..bbb415ed1b8 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
@@ -82,6 +82,8 @@ class Value extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $object)
{
@@ -208,6 +210,7 @@ class Value extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $object)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php
index c28f18ff31e..a1878d96976 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php
@@ -187,6 +187,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param array $optionIds
* @param int $storeId
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getValuesByOption($optionIds, $storeId = null)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Setup.php b/app/code/Magento/Catalog/Model/Resource/Setup.php
index bb2713d989c..7b3193814e8 100644
--- a/app/code/Magento/Catalog/Model/Resource/Setup.php
+++ b/app/code/Magento/Catalog/Model/Resource/Setup.php
@@ -80,6 +80,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
* Default entites and attributes
*
* @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getDefaultEntities()
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Url.php b/app/code/Magento/Catalog/Model/Resource/Url.php
index eacf7eceddc..85be258b809 100644
--- a/app/code/Magento/Catalog/Model/Resource/Url.php
+++ b/app/code/Magento/Catalog/Model/Resource/Url.php
@@ -362,6 +362,8 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param int $storeId
* @param string $path
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getCategories($categoryIds, $storeId = null, $path = null)
{
diff --git a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
index 922a5d28548..2ffc5553043 100644
--- a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
+++ b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
@@ -17,6 +17,9 @@ use Magento\Store\Model\ScopeInterface;
use Magento\UrlRewrite\Model\Storage\DbStorage;
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Suffix extends \Magento\Framework\App\Config\Value
{
/** @var \Magento\UrlRewrite\Helper\UrlRewrite */
@@ -42,6 +45,7 @@ class Suffix extends \Magento\Framework\App\Config\Value
* @param \Magento\Framework\App\Resource $appResource
* @param \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index 58542994dc4..757eb4dd4f1 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -249,6 +249,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
* Get clear tier price list stored in DB
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function getStoredTierPrices()
{
diff --git a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
index 0e2b2e84f9e..a99acfa5cb5 100644
--- a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
@@ -83,6 +83,7 @@ class PriceBox extends PriceBoxRender
*
* @param Product $product
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCanDisplayQty(Product $product)
{
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index c3d0f1d7943..1cfbecff666 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -8,6 +8,9 @@ namespace Magento\CatalogImportExport\Model\Export;
* Export entity product model
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
{
@@ -212,6 +215,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
* @param Product\Type\Factory $_typeFactory
* @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
* @param \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -758,6 +762,10 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
* Get export data for collection
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _getExportData()
{
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 60bcd0528cf..0164b490e1c 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -8,6 +8,9 @@ use Magento\Framework\App\Filesystem\DirectoryList;
/**
* Import entity product model
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
{
@@ -524,6 +527,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
* @param array $data
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Helper\Data $coreData,
@@ -824,6 +828,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param array $rowData
* @param int $rowNum
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _isProductCategoryValid(array $rowData, $rowNum)
{
@@ -892,6 +898,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param array $rowData
* @param int $rowNum
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _isTierPriceValid(array $rowData, $rowNum)
{
@@ -959,6 +966,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param array $rowData
* @param int $rowNum
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _isGroupPriceValid(array $rowData, $rowNum)
{
@@ -1049,6 +1057,9 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* Must be called after ALL products saving done.
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _saveLinks()
{
@@ -1282,6 +1293,9 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* Gather and save information about product entities.
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _saveProducts()
{
@@ -1636,6 +1650,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
*
* @param array $mediaGalleryData
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _saveMediaGallery(array $mediaGalleryData)
{
@@ -1918,6 +1933,9 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param array $rowData
* @param int $rowNum
* @return boolean
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function validateRow(array $rowData, $rowNum)
{
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index 52639e64620..bb1c2245c6b 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -1168,6 +1168,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param array &$parentCount
* @param array &$childCount
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _collectOptionTypeData(
array $rowData,
@@ -1437,6 +1438,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param int $optionTypeId
* @param bool $defaultStore
* @return array|false
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _getSpecificTypeData(array $rowData, $optionTypeId, $defaultStore = true)
{
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index 8685e70537f..9baf5e1afaa 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -122,6 +122,7 @@ abstract class AbstractType
* @param array $attrParams Refined attribute parameters.
* @param mixed $attribute
* @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _addAttributeParams($attrSetName, array $attrParams, $attribute)
{
@@ -200,6 +201,7 @@ abstract class AbstractType
*
* @param string $attrCode
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _isAttributeRequiredCheckNeeded($attrCode)
{
@@ -212,6 +214,7 @@ abstract class AbstractType
* @param array $rowData
* @param int $rowNum
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _isParticularAttributesValid(array $rowData, $rowNum)
{
@@ -246,6 +249,7 @@ abstract class AbstractType
* @param int $rowNum
* @param bool $isNewProduct Optional
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
{
@@ -300,6 +304,7 @@ abstract class AbstractType
* @param bool $withDefaultValue
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDefaultValue = true)
{
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
index 30a605e1a75..909f3b9d42d 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
@@ -91,16 +91,19 @@ interface StockItemInterface extends ExtensibleDataInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsQtyDecimal();
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getShowDefaultNotificationMessage();
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigMinQty();
@@ -125,6 +128,7 @@ interface StockItemInterface extends ExtensibleDataInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigMaxSaleQty();
@@ -137,6 +141,7 @@ interface StockItemInterface extends ExtensibleDataInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigBackorders();
@@ -149,6 +154,7 @@ interface StockItemInterface extends ExtensibleDataInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigNotifyStockQty();
@@ -161,6 +167,7 @@ interface StockItemInterface extends ExtensibleDataInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigQtyIncrements();
@@ -173,6 +180,7 @@ interface StockItemInterface extends ExtensibleDataInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigEnableQtyInc();
@@ -180,11 +188,13 @@ interface StockItemInterface extends ExtensibleDataInterface
* Retrieve whether Quantity Increments is enabled
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getEnableQtyIncrements();
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigManageStock();
@@ -192,6 +202,7 @@ interface StockItemInterface extends ExtensibleDataInterface
* Retrieve can Manage Stock
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getManageStock();
@@ -202,6 +213,7 @@ interface StockItemInterface extends ExtensibleDataInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsDecimalDivided();
diff --git a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
index 34b34a6ad08..28a538ece58 100644
--- a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
@@ -68,6 +68,7 @@ interface StockConfigurationInterface
*
* @param int $storeId
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getEnableQtyIncrements($storeId = null);
@@ -98,6 +99,7 @@ interface StockConfigurationInterface
*
* @param int $storeId
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCanBackInStock($storeId = null);
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
index 0e3233a749f..01301a64318 100644
--- a/app/code/Magento/CatalogInventory/Helper/Stock.php
+++ b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -83,6 +83,7 @@ class Stock
*
* @param \Magento\Catalog\Model\Resource\Collection\AbstractCollection $productCollection
* @return void
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function addStockStatusToProducts(
\Magento\Catalog\Model\Resource\Collection\AbstractCollection $productCollection
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
index 4c0be1afe7f..b8a17f45f69 100644
--- a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -35,6 +35,7 @@ class Item extends \Magento\CatalogInventory\Model\Stock\Item
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -112,6 +113,7 @@ class Item extends \Magento\CatalogInventory\Model\Stock\Item
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getShowDefaultNotificationMessage()
{
diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
index f9705bdf870..755df20868d 100644
--- a/app/code/Magento/CatalogInventory/Model/Configuration.php
+++ b/app/code/Magento/CatalogInventory/Model/Configuration.php
@@ -254,6 +254,7 @@ class Configuration implements StockConfigurationInterface
*
* @param null|string|bool|int|\Magento\Store\Model\Store $store
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getEnableQtyIncrements($store = null)
{
@@ -312,6 +313,7 @@ class Configuration implements StockConfigurationInterface
*
* @param null|string|bool|int|\Magento\Store\Model\Store $store
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCanBackInStock($store = null)
{
diff --git a/app/code/Magento/CatalogInventory/Model/Observer.php b/app/code/Magento/CatalogInventory/Model/Observer.php
index a10c6d80870..d5f2bb21e7e 100644
--- a/app/code/Magento/CatalogInventory/Model/Observer.php
+++ b/app/code/Magento/CatalogInventory/Model/Observer.php
@@ -15,6 +15,7 @@ use Magento\Sales\Model\Quote\Item as QuoteItem;
/**
* Catalog inventory module observer
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Observer
{
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
index 18c5eeeb34a..fcf9b51b8a3 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
@@ -56,6 +56,9 @@ class QuantityValidator
*
* @return void
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function validate(\Magento\Framework\Event\Observer $observer)
{
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
index 642152da6e8..6a362336cf2 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
@@ -49,6 +49,8 @@ class StockItem
*
* @return \Magento\Framework\Object
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function initialize(
\Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem,
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
index c9d48baae84..a212b6c13dd 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
@@ -131,6 +131,7 @@ class DefaultStock extends \Magento\Catalog\Model\Resource\Product\Indexer\Abstr
* Check product type is composite
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsComposite()
{
@@ -156,6 +157,7 @@ class DefaultStock extends \Magento\Catalog\Model\Resource\Product\Indexer\Abstr
* @param int|array $entityIds
* @param bool $usePrimaryTable use primary or temporary index table
* @return \Magento\Framework\DB\Select
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = false)
{
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index bfb3d1fcec2..17c0711d921 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -39,6 +39,7 @@ use Magento\Framework\Model\AbstractExtensibleModel;
* @method \Magento\CatalogInventory\Model\Stock\Item setQtyIncrements(float $value)
* @method \Magento\CatalogInventory\Model\Stock\Item setUseConfigEnableQtyInc(int $value)
* @method \Magento\CatalogInventory\Model\Stock\Item setEnableQtyIncrements(int $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Item extends AbstractExtensibleModel implements StockItemInterface
{
@@ -122,6 +123,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -211,6 +213,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getStockStatusChangedAuto()
{
@@ -240,6 +243,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsQtyDecimal()
{
@@ -248,6 +252,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsDecimalDivided()
{
@@ -266,6 +271,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
* Check if notification message should be added despite of backorders notification flag
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getShowDefaultNotificationMessage()
{
@@ -274,6 +280,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigMinQty()
{
@@ -297,6 +304,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigMinSaleQty()
{
@@ -320,6 +328,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigMaxSaleQty()
{
@@ -344,6 +353,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigNotifyStockQty()
{
@@ -365,6 +375,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigEnableQtyInc()
{
@@ -375,6 +386,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
* Retrieve whether Quantity Increments is enabled
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getEnableQtyIncrements()
{
@@ -388,6 +400,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
* Retrieve whether config for Quantity Increments should be used
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigQtyIncrements()
{
@@ -418,6 +431,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigBackorders()
{
@@ -439,6 +453,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUseConfigManageStock()
{
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
index 8d74e574c3a..46f65da7664 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
@@ -22,6 +22,7 @@ use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
/**
* Class StockItemRepository
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class StockItemRepository implements StockItemRepositoryInterface
{
@@ -86,6 +87,7 @@ class StockItemRepository implements StockItemRepositoryInterface
* @param MapperFactory $mapperFactory
* @param TimezoneInterface $localeDate
* @param Processor $indexProcessor
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
StockConfigurationInterface $stockConfiguration,
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php
index cfd5cc8d9a2..01d0d54b574 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockRepository.php
@@ -17,6 +17,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
/**
* Class StockRepository
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class StockRepository implements StockRepositoryInterface
{
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php
index e3eb4bc1c57..613f20e6ed4 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockStatusRepository.php
@@ -15,6 +15,7 @@ use Magento\Framework\Exception\CouldNotSaveException;
/**
* Class StockStatusRepository
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class StockStatusRepository implements StockStatusRepositoryInterface
{
diff --git a/app/code/Magento/CatalogInventory/Model/StockIndex.php b/app/code/Magento/CatalogInventory/Model/StockIndex.php
index 1bf059039ce..c7a1d895e09 100644
--- a/app/code/Magento/CatalogInventory/Model/StockIndex.php
+++ b/app/code/Magento/CatalogInventory/Model/StockIndex.php
@@ -74,6 +74,7 @@ class StockIndex implements StockIndexInterface
* @param int $productId
* @param int $websiteId
* @return true
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function rebuild($productId = null, $websiteId = null)
{
@@ -126,6 +127,7 @@ class StockIndex implements StockIndexInterface
* @param int $qty
* @param int $status
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function processChildren(
$productId,
diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
index f6f39f50015..235a248f17e 100644
--- a/app/code/Magento/CatalogInventory/Model/StockManagement.php
+++ b/app/code/Magento/CatalogInventory/Model/StockManagement.php
@@ -67,6 +67,7 @@ class StockManagement implements StockManagementInterface
* @param int $websiteId
* @return StockItemInterface[]
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function registerProductsSale($items, $websiteId = null)
{
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
index 8fa8bba389b..e67d97fe426 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -18,6 +18,7 @@ use Magento\Store\Model\StoreManagerInterface;
/**
* Class StockRegistryProvider
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class StockRegistryProvider implements StockRegistryProviderInterface
{
diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
index a69d3a40ce9..bb82b4c100f 100644
--- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -92,6 +92,9 @@ class StockStateProvider implements StockStateProviderInterface
* @param int|float $summaryQty
* @param int|float $origQty
* @return \Magento\Framework\Object
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQty, $origQty = 0)
{
@@ -319,6 +322,8 @@ class StockStateProvider implements StockStateProviderInterface
*
* @param StockItemInterface $stockItem
* @return float
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getStockQty(StockItemInterface $stockItem)
{
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
index 702c263fc45..803e7db212c 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
@@ -52,6 +52,7 @@ class Actions extends Generic implements TabInterface
/**
* @return Form
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
index c8344ff8dbe..d3020b2298d 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
@@ -105,6 +105,7 @@ class Main extends Generic implements TabInterface
/**
* @return Form
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
index 70f07b81bfb..cf1ae7917c5 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
@@ -11,6 +11,7 @@ class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
{
/**
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index 9c5cbbedb2b..bada3b8bb6f 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -11,6 +11,9 @@ use Magento\CatalogRule\Model\Resource\Rule\CollectionFactory as RuleCollectionF
use Magento\CatalogRule\Model\Rule;
use Magento\Framework\Pricing\PriceCurrencyInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class IndexBuilder
{
const SECONDS_IN_DAY = 86400;
@@ -81,6 +84,7 @@ class IndexBuilder
* @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param int $batchCount
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
RuleCollectionFactory $ruleCollectionFactory,
@@ -209,6 +213,7 @@ class IndexBuilder
* @param Product $product
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function applyRule(Rule $rule, $product)
{
@@ -317,6 +322,8 @@ class IndexBuilder
/**
* @param Rule $rule
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function updateRuleProductData(Rule $rule)
{
@@ -399,6 +406,9 @@ class IndexBuilder
* @param Product|null $product
* @throws \Exception
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function applyAllRules(Product $product = null)
{
diff --git a/app/code/Magento/CatalogRule/Model/Observer.php b/app/code/Magento/CatalogRule/Model/Observer.php
index fe95ba131b6..9aef0eab0b3 100644
--- a/app/code/Magento/CatalogRule/Model/Observer.php
+++ b/app/code/Magento/CatalogRule/Model/Observer.php
@@ -21,6 +21,9 @@ use Magento\Customer\Model\Session as CustomerModelSession;
use Magento\Framework\Event\Observer as EventObserver;
use Magento\Framework\Stdlib\DateTime;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Observer
{
/**
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
index 8d2f50e3fd9..c190214d713 100644
--- a/app/code/Magento/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -99,6 +99,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param PriceCurrencyInterface $priceCurrency
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index dfbad0eb86f..78b9a2b1e07 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -36,6 +36,8 @@ use Magento\Catalog\Model\Product;
* @method \Magento\CatalogRule\Model\Rule setDiscountAmount(float $value)
* @method string getWebsiteIds()
* @method \Magento\CatalogRule\Model\Rule setWebsiteIds(string $value)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Rule extends \Magento\Rule\Model\AbstractModel
{
@@ -159,6 +161,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $relatedCacheTypes
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -340,6 +343,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
* @param Product $product
* @param float $price
* @return float|null
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function calcProductPriceRule(Product $product, $price)
{
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
index 34f434eb708..9619c899c65 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
@@ -15,6 +15,9 @@ use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
use Magento\Framework\Search\Request\BucketInterface;
use Magento\Store\Model\Store;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class DataProvider implements DataProviderInterface
{
/**
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
index 46d19101a7d..c6c7da4ae01 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
@@ -16,6 +16,9 @@ use Magento\Framework\Search\Dynamic\IntervalFactory;
use Magento\Framework\Search\Request\BucketInterface;
use Magento\Store\Model\ScopeInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class DataProvider implements DataProviderInterface
{
const XML_PATH_INTERVAL_DIVISION_LIMIT = 'catalog/layered_navigation/interval_division_limit';
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
index 0ad924de9c3..44f3db45bf7 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
@@ -62,6 +62,7 @@ class Preprocessor implements PreprocessorInterface
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function process(FilterInterface $filter, $isNegation, $query)
{
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index c537e2b8e5e..60ba4855b18 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -41,6 +41,7 @@ use Magento\Store\Model\StoreManagerInterface;
* @method \Magento\CatalogSearch\Model\Advanced setUpdatedAt(string $value)
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Advanced extends \Magento\Framework\Model\AbstractModel
{
@@ -120,6 +121,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
* @param ProductFactory $productFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
Context $context,
@@ -155,6 +157,8 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
* @param array $values
* @return $this
* @throws Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addFilters($values)
{
@@ -283,6 +287,8 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
* @param EntityAttribute $attribute
* @param mixed $value
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _addSearchCriteria($attribute, $value)
{
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index 25a1c87a705..07a8bf4a141 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -6,6 +6,10 @@ namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Action;
use Magento\Framework\Pricing\PriceCurrencyInterface;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Full
{
/**
@@ -154,6 +158,7 @@ class Full
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\CatalogSearch\Model\Resource\Fulltext $fulltextResource
* @param PriceCurrencyInterface $priceCurrency
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
@@ -258,6 +263,8 @@ class Full
* @param int $storeId Store View Id
* @param int|array $productIds Product Entity Id
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function rebuildStoreIndex($storeId, $productIds = null)
{
@@ -636,6 +643,8 @@ class Full
* @param array $productData
* @param int $storeId
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function prepareProductIndex($indexData, $productData, $storeId)
{
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
index 4951758f227..a2c1b634050 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
@@ -88,6 +88,7 @@ class Decimal extends AbstractFilter
*
* @return array
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getItemsData()
{
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index a364ae6e605..4081154e8e6 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -53,6 +53,7 @@ class Price extends AbstractFilter
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory $algorithmFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
@@ -106,6 +107,7 @@ class Price extends AbstractFilter
*
* @param \Magento\Framework\App\RequestInterface $request
* @return $this
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function apply(\Magento\Framework\App\RequestInterface $request)
{
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php b/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
index c0f0c1662b2..d4a19e82a05 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
@@ -84,6 +84,7 @@ class Advanced extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Catalog\Model\Resource\Eav\Attribute $attribute
* @param string|array $value
* @return string|array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function prepareCondition($attribute, $value)
{
@@ -121,6 +122,7 @@ class Advanced extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param string|array $value
* @param int $rate
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function addRatedPriceFilter($collection, $attribute, $value, $rate = 1)
{
@@ -165,6 +167,7 @@ class Advanced extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Catalog\Model\Resource\Eav\Attribute $attribute
* @param string|array $value
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addIndexableAttributeModifiedFilter($collection, $attribute, $value)
{
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
index f8d25720209..37029e4365b 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
@@ -10,6 +10,7 @@ use Magento\Catalog\Model\Product;
* Collection Advanced
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
{
@@ -121,6 +122,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
/**
* @inheritdoc
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _renderFiltersBefore()
{
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
index 3a6827063f7..92d2fffb6de 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
@@ -10,6 +10,7 @@ use Magento\Framework\Search\Response\QueryResponse;
/**
* Fulltext Collection
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
{
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
index 2880a05ef46..678ffa8339b 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
@@ -8,6 +8,7 @@ namespace Magento\CatalogSearch\Model\Resource\Search;
* Search collection
*
* @deprecated
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Collection extends \Magento\Catalog\Model\Resource\Product\Collection implements \Magento\Search\Model\SearchCollectionInterface
{
@@ -270,6 +271,8 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection impl
*
* @param mixed $query
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getSearchInOptionSql($query)
{
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
index df7bd250c96..c1d723999fb 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
@@ -135,6 +135,7 @@ class RequestGenerator
* Generate advanced search request
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
private function generateAdvancedSearchRequest()
{
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index 3779f07c8bf..c20e511bf7e 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -7,6 +7,7 @@ namespace Magento\CatalogWidget\Block\Product;
/**
* Catalog Products List widget block
* Class ProductsList
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Widget\Block\BlockInterface
{
@@ -146,6 +147,7 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getProductPriceHtml(
\Magento\Catalog\Model\Product $product,
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index d41ab443e4d..c57feb10ca6 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -42,6 +42,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Rule\Model\Condition\Context $context,
diff --git a/app/code/Magento/Centinel/Model/Config.php b/app/code/Magento/Centinel/Model/Config.php
index 05ca3a3f725..89cc104a3c5 100644
--- a/app/code/Magento/Centinel/Model/Config.php
+++ b/app/code/Magento/Centinel/Model/Config.php
@@ -116,6 +116,7 @@ class Config
* Return flag - is centinel mode test
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsTestMode()
{
@@ -137,6 +138,7 @@ class Config
* Define if debugging is enabled
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDebugFlag()
{
diff --git a/app/code/Magento/Centinel/Model/Service.php b/app/code/Magento/Centinel/Model/Service.php
index f364c33e8a5..3e78adfc8af 100644
--- a/app/code/Magento/Centinel/Model/Service.php
+++ b/app/code/Magento/Centinel/Model/Service.php
@@ -141,6 +141,7 @@ class Service extends \Magento\Framework\Object
* @param float $amount
* @param string $currencyCode
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _generateChecksum(
$paymentMethodCode,
diff --git a/app/code/Magento/Centinel/Model/State/Mastercard.php b/app/code/Magento/Centinel/Model/State/Mastercard.php
index de32102b29b..ba75f85d48e 100644
--- a/app/code/Magento/Centinel/Model/State/Mastercard.php
+++ b/app/code/Magento/Centinel/Model/State/Mastercard.php
@@ -25,6 +25,8 @@ class Mastercard extends \Magento\Centinel\Model\AbstractState
* Result depends from flag self::getIsModeStrict()
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function isAuthenticateSuccessful()
{
@@ -132,6 +134,7 @@ class Mastercard extends \Magento\Centinel\Model\AbstractState
* Analyse lookup`s results. If lookup is soft successful return true
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _isLookupSoftSuccessful()
{
diff --git a/app/code/Magento/Centinel/Model/State/Visa.php b/app/code/Magento/Centinel/Model/State/Visa.php
index 9ed47d9e00b..1d73658f298 100644
--- a/app/code/Magento/Centinel/Model/State/Visa.php
+++ b/app/code/Magento/Centinel/Model/State/Visa.php
@@ -25,6 +25,9 @@ class Visa extends \Magento\Centinel\Model\AbstractState
* Result depends from flag self::getIsModeStrict()
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function isAuthenticateSuccessful()
{
@@ -151,6 +154,7 @@ class Visa extends \Magento\Centinel\Model\AbstractState
* Analyse lookup`s results. If lookup is soft successful return true
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _isLookupSoftSuccessful()
{
diff --git a/app/code/Magento/Checkout/Block/Cart.php b/app/code/Magento/Checkout/Block/Cart.php
index 7f3fa41ea8f..ea043a7b5e5 100644
--- a/app/code/Magento/Checkout/Block/Cart.php
+++ b/app/code/Magento/Checkout/Block/Cart.php
@@ -66,6 +66,7 @@ class Cart extends \Magento\Checkout\Block\Cart\AbstractCart
* prepare cart items URLs
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function prepareItemUrls()
{
@@ -163,6 +164,7 @@ class Cart extends \Magento\Checkout\Block\Cart\AbstractCart
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsVirtual()
{
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index d8f150979b5..77aa7bb122d 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -15,6 +15,7 @@ use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
*
* @method \Magento\Checkout\Block\Cart\Item\Renderer setProductName(string)
* @method \Magento\Checkout\Block\Cart\Item\Renderer setDeleteUrl(string)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Renderer extends \Magento\Framework\View\Element\Template implements \Magento\Framework\View\Block\IdentityInterface
{
diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 17f3d8f19d4..0aec7f5a8f0 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -195,6 +195,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
* Show City in Shipping Estimation
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCityActive()
{
@@ -205,6 +206,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
* Show State in Shipping Estimation. Result updated using plugins
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getStateActive()
{
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 2d03078111b..6e08aebd3d7 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -158,6 +158,7 @@ class Sidebar extends AbstractCart implements IdentityInterface
* Get one page checkout page url
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCheckoutUrl()
{
@@ -168,6 +169,7 @@ class Sidebar extends AbstractCart implements IdentityInterface
* Define if Mini Shopping Cart Pop-Up Menu enabled
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsNeedToDisplaySideBar()
{
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index 72d116e13c6..1a5f46fb32f 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -25,6 +25,7 @@ class Onepage extends \Magento\Checkout\Block\Onepage\AbstractOnepage
* @param \Magento\Framework\App\Http\Context $httpContext
* @param \Magento\Customer\Model\Address\Mapper $addressMapper
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
index 746296fc981..4bd52a59ef6 100644
--- a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
@@ -13,6 +13,7 @@ use Magento\Sales\Model\Quote;
/**
* One page common functionality block
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractOnepage extends \Magento\Framework\View\Element\Template
{
@@ -99,6 +100,7 @@ abstract class AbstractOnepage extends \Magento\Framework\View\Element\Template
* @param \Magento\Framework\App\Http\Context $httpContext
* @param \Magento\Customer\Model\Address\Mapper $addressMapper
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Checkout/Block/Onepage/Billing.php b/app/code/Magento/Checkout/Block/Onepage/Billing.php
index 5f232f4c6f2..e8937599864 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Billing.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Billing.php
@@ -9,6 +9,7 @@ use Magento\Customer\Model\Address\Config as AddressConfig;
/**
* One page checkout status
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Billing extends \Magento\Checkout\Block\Onepage\AbstractOnepage
{
@@ -45,6 +46,7 @@ class Billing extends \Magento\Checkout\Block\Onepage\AbstractOnepage
* @param \Magento\Customer\Model\Address\Mapper $addressMapper
* @param \Magento\Sales\Model\Quote\AddressFactory $addressFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Checkout/Block/Onepage/Login.php b/app/code/Magento/Checkout/Block/Onepage/Login.php
index 20ed2288b63..4926d88ba5b 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Login.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Login.php
@@ -10,6 +10,7 @@ use Magento\Framework\Message\Collection;
/**
* One page checkout status
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Login extends AbstractOnepage
{
@@ -53,6 +54,7 @@ class Login extends AbstractOnepage
* @param \Magento\Customer\Model\Registration $registration
* @param \Magento\Customer\Model\Address\Mapper $dataObjectConverter
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Checkout/Block/Onepage/Shipping.php b/app/code/Magento/Checkout/Block/Onepage/Shipping.php
index 9cc46d16483..e1991fd71e6 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Shipping.php
@@ -9,6 +9,7 @@ use Magento\Customer\Model\Address\Config as AddressConfig;
/**
* One page checkout status
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Shipping extends \Magento\Checkout\Block\Onepage\AbstractOnepage
{
@@ -38,6 +39,7 @@ class Shipping extends \Magento\Checkout\Block\Onepage\AbstractOnepage
* @param \Magento\Customer\Model\Address\Mapper $addressMapper
* @param \Magento\Sales\Model\Quote\AddressFactory $addressFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
index 713b5331a4b..4d854962a07 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
@@ -10,6 +10,7 @@ use Magento\Sales\Model\Quote\Address;
/**
* One page checkout status
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Available extends \Magento\Checkout\Block\Onepage\AbstractOnepage
{
@@ -36,6 +37,7 @@ class Available extends \Magento\Checkout\Block\Onepage\AbstractOnepage
* @param \Magento\Framework\App\Http\Context $httpContext
* @param \Magento\Customer\Model\Address\Mapper $addressMapper
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Checkout/Block/Total/Nominal.php b/app/code/Magento/Checkout/Block/Total/Nominal.php
index e77ae71bb9e..c063789c15f 100644
--- a/app/code/Magento/Checkout/Block/Total/Nominal.php
+++ b/app/code/Magento/Checkout/Block/Total/Nominal.php
@@ -103,6 +103,7 @@ class Nominal extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @param \Magento\Framework\Object $row
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getItemDetailsRowIsCompounded(\Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index 64abe026ff2..805d58e89c5 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -61,6 +61,7 @@ class Add extends \Magento\Checkout\Controller\Cart
* Add product to shopping cart action
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index 4bb72d37dae..936e1634422 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -49,6 +49,8 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
* Initialize coupon
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
index 7cc5528e1a4..36d2d63ffad 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -11,6 +11,8 @@ class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
* Update product configuration for a cart item
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Checkout/Controller/Onepage.php b/app/code/Magento/Checkout/Controller/Onepage.php
index d4d5b6836ad..0ff159b0e78 100644
--- a/app/code/Magento/Checkout/Controller/Onepage.php
+++ b/app/code/Magento/Checkout/Controller/Onepage.php
@@ -9,6 +9,9 @@ use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Framework\App\Action\NotFoundException;
use Magento\Framework\App\RequestInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Onepage extends Action
{
/**
@@ -68,6 +71,7 @@ class Onepage extends Action
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\View\LayoutFactory $layoutFactory
* @param \Magento\Sales\Model\QuoteRepository $quoteRepository
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
index 1fa75bfe5cc..4ceae281def 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
@@ -11,6 +11,8 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
* Create order action
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function execute()
{
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php b/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
index 28e561ecaa5..56710670827 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
@@ -23,6 +23,7 @@ class SavePayment extends \Magento\Checkout\Controller\Onepage
* Sets either redirect or a JSON response
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index 7dd2339de1e..215468d34b6 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -190,6 +190,7 @@ class Cart extends \Magento\Core\Helper\Url
* Check quote for virtual products only
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsVirtualQuote()
{
@@ -201,6 +202,7 @@ class Cart extends \Magento\Core\Helper\Url
*
* @param int|string|\Magento\Store\Model\Store $store
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getShouldRedirectToCart($store = null)
{
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index 130ab9c9cc5..46714dc7b00 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -12,6 +12,7 @@ use Magento\Store\Model\Store;
* Checkout default helper
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
@@ -206,6 +207,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param string $message
* @param string $checkoutType
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'onepage')
{
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index 1ef8dc6e160..cfd0cb6ab3c 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -12,6 +12,7 @@ use Magento\Framework\Object;
/**
* Shopping cart model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Cart extends Object implements CartInterface
{
@@ -101,6 +102,7 @@ class Cart extends Object implements CartInterface
* @param \Magento\Sales\Model\QuoteRepository $quoteRepository
* @param ProductRepositoryInterface $productRepository
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -329,6 +331,7 @@ class Cart extends Object implements CartInterface
* @param \Magento\Framework\Object|int|array $requestInfo
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addProduct($productInfo, $requestInfo = null)
{
@@ -472,6 +475,8 @@ class Cart extends Object implements CartInterface
* @param array $data
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function updateItems($data)
{
@@ -656,6 +661,7 @@ class Cart extends Object implements CartInterface
* @throws \Magento\Framework\Model\Exception
*
* @see \Magento\Sales\Model\Quote::updateItem()
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function updateItem($itemId, $requestInfo = null, $updatingParams = null)
{
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index e96f1f02dd6..a96deebe17e 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -7,6 +7,9 @@ namespace Magento\Checkout\Model;
use Magento\Customer\Api\Data\CustomerInterface;
use Magento\Sales\Model\Quote;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Session extends \Magento\Framework\Session\SessionManager
{
/**
@@ -93,6 +96,7 @@ class Session extends \Magento\Framework\Session\SessionManager
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Request\Http $request,
@@ -169,6 +173,8 @@ class Session extends \Magento\Framework\Session\SessionManager
* Get checkout quote instance by current session
*
* @return Quote
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getQuote()
{
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index e8aef6e7a50..d489102ac37 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -19,6 +19,11 @@ use Magento\Customer\Model\Metadata\Form;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Onepage
{
/**
@@ -191,6 +196,7 @@ class Onepage
* @param CustomerRepositoryInterface $customerRepository
* @param \Magento\Sales\Model\QuoteRepository $quoteRepository
* @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -297,6 +303,7 @@ class Onepage
* Initialize quote state to be valid for one page checkout
*
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function initCheckout()
{
@@ -371,6 +378,9 @@ class Onepage
* @param array $data
* @param int $customerAddressId
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function saveBilling($data, $customerAddressId)
{
@@ -622,6 +632,8 @@ class Onepage
* @param array $data
* @param int $customerAddressId
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function saveShipping($data, $customerAddressId)
{
@@ -842,6 +854,7 @@ class Onepage
* Prepare quote for customer order submit
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareCustomerQuote()
{
diff --git a/app/code/Magento/Checkout/Service/V1/Cart/ReadService.php b/app/code/Magento/Checkout/Service/V1/Cart/ReadService.php
index e408788b6ec..14b0bc8d06a 100644
--- a/app/code/Magento/Checkout/Service/V1/Cart/ReadService.php
+++ b/app/code/Magento/Checkout/Service/V1/Cart/ReadService.php
@@ -14,6 +14,7 @@ use Magento\Sales\Model\Resource\Quote\Collection as QuoteCollection;
/**
* Cart read service object.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ReadService implements ReadServiceInterface
{
diff --git a/app/code/Magento/Checkout/Service/V1/Data/Cart/Customer.php b/app/code/Magento/Checkout/Service/V1/Data/Cart/Customer.php
index 220d45a510d..90c94586318 100644
--- a/app/code/Magento/Checkout/Service/V1/Data/Cart/Customer.php
+++ b/app/code/Magento/Checkout/Service/V1/Data/Cart/Customer.php
@@ -171,6 +171,7 @@ class Customer extends \Magento\Framework\Api\AbstractExtensibleObject
* Is customer a guest?
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsGuest()
{
diff --git a/app/code/Magento/Checkout/Service/V1/Data/Cart/ShippingMethod.php b/app/code/Magento/Checkout/Service/V1/Data/Cart/ShippingMethod.php
index ef53bed0d8f..dbe6c60f934 100644
--- a/app/code/Magento/Checkout/Service/V1/Data/Cart/ShippingMethod.php
+++ b/app/code/Magento/Checkout/Service/V1/Data/Cart/ShippingMethod.php
@@ -110,6 +110,7 @@ class ShippingMethod extends \Magento\Framework\Api\AbstractExtensibleObject
* Returns the value of the availability flag for the current shipping method.
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getAvailable()
{
diff --git a/app/code/Magento/Checkout/Service/V1/Data/CartMapper.php b/app/code/Magento/Checkout/Service/V1/Data/CartMapper.php
index 510f7db92e6..d7161fcb8bf 100644
--- a/app/code/Magento/Checkout/Service/V1/Data/CartMapper.php
+++ b/app/code/Magento/Checkout/Service/V1/Data/CartMapper.php
@@ -9,6 +9,7 @@ use Magento\Sales\Model\Quote;
/**
* Cart mapper
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class CartMapper
{
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit/Form.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit/Form.php
index 970da457b99..6207184b390 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit/Form.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit/Form.php
@@ -44,6 +44,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
index 17b4768ccdd..ce1d51909cb 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
@@ -118,6 +118,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
* @param \Magento\Framework\Data\Collection $collection
* @param \Magento\Backend\Block\Widget\Grid\Column $column
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _filterStoreCondition($collection, $column)
{
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
index 45cf11e85ab..0db0b8ef7e0 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Edit.php
@@ -9,6 +9,7 @@ class Edit extends \Magento\CheckoutAgreements\Controller\Adminhtml\Agreement
{
/**
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php
index 08b2e44fe25..3fe6b9853e6 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php
@@ -36,6 +36,7 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
* Prepare form
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
index 8c747bcc728..9ff73a1c660 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
@@ -175,6 +175,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
* @param \Magento\Framework\Data\Collection $collection
* @param \Magento\Framework\Object $column
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _filterStoreCondition($collection, \Magento\Framework\Object $column)
{
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
index b6c1688c8ab..58b72a76abd 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -11,6 +11,7 @@ class Edit extends \Magento\Cms\Controller\Adminhtml\Block
* Edit CMS block
*
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
index 1044910cc4c..d3f0b4ff466 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -59,6 +59,7 @@ class Edit extends \Magento\Backend\App\Action
* Edit CMS page
*
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
index 0a2861b70a9..7716b231732 100644
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -12,6 +12,7 @@ class Index extends \Magento\Framework\App\Action\Action
*
* @param string|null $coreRoute
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function execute($coreRoute = null)
{
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 7b65b884041..cb389deea1e 100644
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -92,6 +92,7 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\App\ViewInterface $view
* @param \Magento\Framework\View\Page\Config $pageConfig
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
@@ -139,6 +140,8 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
* @param int $pageId
* @param bool $renderLayout
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _renderPage(Action $action, $pageId = null, $renderLayout = true)
{
diff --git a/app/code/Magento/Cms/Model/Resource/Block.php b/app/code/Magento/Cms/Model/Resource/Block.php
index 8d75bc9f05f..5da75e6bfd8 100644
--- a/app/code/Magento/Cms/Model/Resource/Block.php
+++ b/app/code/Magento/Cms/Model/Resource/Block.php
@@ -193,6 +193,7 @@ class Block extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsUniqueBlockToStores(\Magento\Framework\Model\AbstractModel $object)
{
diff --git a/app/code/Magento/Cms/Model/Resource/CmsCriteriaMapper.php b/app/code/Magento/Cms/Model/Resource/CmsCriteriaMapper.php
index 2767beae070..593cf7919be 100644
--- a/app/code/Magento/Cms/Model/Resource/CmsCriteriaMapper.php
+++ b/app/code/Magento/Cms/Model/Resource/CmsCriteriaMapper.php
@@ -37,6 +37,7 @@ class CmsCriteriaMapper extends GenericMapper
*
* @param bool $flag
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function mapFirstStoreFlag($flag)
{
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index e7d6933c8e6..f5c66b52d08 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -11,6 +11,8 @@ use Magento\Framework\App\Filesystem\DirectoryList;
* Wysiwyg Images model
*
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Storage extends \Magento\Framework\Object
{
@@ -186,6 +188,8 @@ class Storage extends \Magento\Framework\Object
*
* @param string $path Parent directory path
* @return \Magento\Framework\Data\Collection\Filesystem
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getDirsCollection($path)
{
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
index 248bc92b55f..17127099bfd 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
@@ -10,6 +10,9 @@
*/
namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\Edit\Tab\Variations;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Main extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain
{
/**
diff --git a/app/code/Magento/Core/App/Router/Base.php b/app/code/Magento/Core/App/Router/Base.php
index bfb4a0d2155..22523d3cb17 100644
--- a/app/code/Magento/Core/App/Router/Base.php
+++ b/app/code/Magento/Core/App/Router/Base.php
@@ -8,6 +8,10 @@ namespace Magento\Core\App\Router;
use Magento\Framework\App\RequestInterface;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Base implements \Magento\Framework\App\RouterInterface
{
/**
@@ -116,6 +120,8 @@ class Base implements \Magento\Framework\App\RouterInterface
* @param string $routerId
* @param \Magento\Framework\Code\NameBuilder $nameBuilder
* @throws \InvalidArgumentException
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
\Magento\Framework\App\Router\ActionList $actionList,
@@ -253,6 +259,8 @@ class Base implements \Magento\Framework\App\RouterInterface
* @param \Magento\Framework\App\RequestInterface $request
* @param array $params
* @return \Magento\Framework\App\Action\Action|null
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function matchAction(\Magento\Framework\App\RequestInterface $request, array $params)
{
@@ -344,6 +352,7 @@ class Base implements \Magento\Framework\App\RouterInterface
* @param \Magento\Framework\App\RequestInterface $request
* @param string $path
* @return void
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
protected function _checkShouldBeSecure(\Magento\Framework\App\RequestInterface $request, $path = '')
{
diff --git a/app/code/Magento/Core/Model/File/Storage.php b/app/code/Magento/Core/Model/File/Storage.php
index 153ebd3aab7..b610a3c3cd4 100644
--- a/app/code/Magento/Core/Model/File/Storage.php
+++ b/app/code/Magento/Core/Model/File/Storage.php
@@ -10,6 +10,7 @@ use Magento\Framework\Model\AbstractModel;
/**
* Class Storage
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Storage extends AbstractModel
{
@@ -96,6 +97,7 @@ class Storage extends AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -194,6 +196,8 @@ class Storage extends AbstractModel
*
* @param array $storage
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function synchronize($storage)
{
diff --git a/app/code/Magento/Core/Model/File/Storage/Database.php b/app/code/Magento/Core/Model/File/Storage/Database.php
index 6484ffcb070..be0c83b686f 100644
--- a/app/code/Magento/Core/Model/File/Storage/Database.php
+++ b/app/code/Magento/Core/Model/File/Storage/Database.php
@@ -52,6 +52,7 @@ class Database extends \Magento\Core\Model\File\Storage\Database\AbstractDatabas
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param null $connectionName
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Core/Model/File/Storage/Directory/Database.php b/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
index 0174d3b1c90..34d7fd72e34 100644
--- a/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
+++ b/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
@@ -39,6 +39,7 @@ class Database extends \Magento\Core\Model\File\Storage\Database\AbstractDatabas
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param null $connectionName
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Core/Model/File/Storage/File.php b/app/code/Magento/Core/Model/File/Storage/File.php
index 66ac32332d0..24030610075 100644
--- a/app/code/Magento/Core/Model/File/Storage/File.php
+++ b/app/code/Magento/Core/Model/File/Storage/File.php
@@ -130,6 +130,7 @@ class File
* @param int $count
* @param string $type
* @return array|bool
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function collectData($offset = 0, $count = 100, $type = 'files')
{
diff --git a/app/code/Magento/Core/Model/File/Storage/Flag.php b/app/code/Magento/Core/Model/File/Storage/Flag.php
index cb6f3f4cad1..3d06707ecbd 100644
--- a/app/code/Magento/Core/Model/File/Storage/Flag.php
+++ b/app/code/Magento/Core/Model/File/Storage/Flag.php
@@ -49,6 +49,7 @@ class Flag extends \Magento\Framework\Flag
*
* @param \Exception $e
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function passError(\Exception $e)
{
diff --git a/app/code/Magento/Core/Model/File/Validator/AvailablePath.php b/app/code/Magento/Core/Model/File/Validator/AvailablePath.php
index af196001769..34e39d97f36 100644
--- a/app/code/Magento/Core/Model/File/Validator/AvailablePath.php
+++ b/app/code/Magento/Core/Model/File/Validator/AvailablePath.php
@@ -190,6 +190,7 @@ class AvailablePath extends \Zend_Validate_Abstract
* @param string $value File/dir path
* @return bool
* @throws \Exception Throw exception on empty both paths masks types
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isValid($value)
{
@@ -231,6 +232,8 @@ class AvailablePath extends \Zend_Validate_Abstract
* @param string[] $paths Protected/available paths masks
* @param bool $protected Paths masks is protected?
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _isValidByPaths($valuePathInfo, $paths, $protected)
{
diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/app/code/Magento/Core/Model/Layout/Merge.php
index a1533f98efb..33df2137fa7 100644
--- a/app/code/Magento/Core/Model/Layout/Merge.php
+++ b/app/code/Magento/Core/Model/Layout/Merge.php
@@ -9,6 +9,8 @@ use Magento\Framework\App\Filesystem\DirectoryList;
/**
* Layout merge model
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
{
@@ -168,6 +170,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Design\ThemeInterface $theme Non-injectable theme instance
* @param string $cacheSuffix
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\DesignInterface $design,
diff --git a/app/code/Magento/Core/Model/Observer.php b/app/code/Magento/Core/Model/Observer.php
index 9f67373acca..c8ac454a76d 100644
--- a/app/code/Magento/Core/Model/Observer.php
+++ b/app/code/Magento/Core/Model/Observer.php
@@ -56,6 +56,7 @@ class Observer
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param Theme\Registration $registration
* @param \Psr\Log\LoggerInterface $logger
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
\Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool,
diff --git a/app/code/Magento/Core/Model/Resource/Design.php b/app/code/Magento/Core/Model/Resource/Design.php
index b9313dc4f56..0e7d6525dbc 100644
--- a/app/code/Magento/Core/Model/Resource/Design.php
+++ b/app/code/Magento/Core/Model/Resource/Design.php
@@ -105,6 +105,8 @@ class Design extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param string $dateTo
* @param int $currentId
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _checkIntersection($storeId, $dateFrom, $dateTo, $currentId)
{
diff --git a/app/code/Magento/Core/Model/Url/RouteParamsResolver.php b/app/code/Magento/Core/Model/Url/RouteParamsResolver.php
index 221c8e2fa58..5ea49391c63 100644
--- a/app/code/Magento/Core/Model/Url/RouteParamsResolver.php
+++ b/app/code/Magento/Core/Model/Url/RouteParamsResolver.php
@@ -49,6 +49,8 @@ class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function setRouteParams(array $data, $unsetOldParams = true)
{
diff --git a/app/code/Magento/Cron/Model/Backend/Config/Structure/Converter.php b/app/code/Magento/Cron/Model/Backend/Config/Structure/Converter.php
index 959dded5f7e..ad034e73622 100644
--- a/app/code/Magento/Cron/Model/Backend/Config/Structure/Converter.php
+++ b/app/code/Magento/Cron/Model/Backend/Config/Structure/Converter.php
@@ -27,6 +27,7 @@ class Converter
*
* @return array
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function afterConvert(\Magento\Backend\Model\Config\Structure\Converter $subject, array $result)
{
diff --git a/app/code/Magento/Cron/Model/Observer.php b/app/code/Magento/Cron/Model/Observer.php
index c28ebef08e7..49deb4445f8 100644
--- a/app/code/Magento/Cron/Model/Observer.php
+++ b/app/code/Magento/Cron/Model/Observer.php
@@ -10,6 +10,9 @@ namespace Magento\Cron\Model;
use Magento\Framework\App\Filesystem\DirectoryList;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Observer
{
/**#@+
@@ -117,6 +120,9 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function dispatch($observer)
{
diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index 8547b88d300..4f62b2289e5 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -127,6 +127,8 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
* @param int $num
* @return bool
* @throws Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function matchCronExpression($expr, $num)
{
diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
index 30fe06f7d95..76dc17819e4 100644
--- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -138,6 +138,8 @@ class Currencysymbol
* Returns currency symbol properties array based on config values
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getCurrencySymbolsData()
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Addresses.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Addresses.php
index a7f02b4a7a9..6542928ff34 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Addresses.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Addresses.php
@@ -18,6 +18,7 @@ use Magento\Customer\Model\Address\Mapper as AddressMapper;
* Customer addresses forms
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Addresses extends GenericMetadata
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
index 681c84647aa..e074cef79b3 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
@@ -10,6 +10,9 @@
*/
namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Reviews extends \Magento\Review\Block\Adminhtml\Grid
{
/**
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index 627a97d1874..38b44235f25 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -14,6 +14,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
* Customer address helper
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Address extends \Magento\Framework\App\Helper\AbstractHelper
{
diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 2ddd80d02b5..6f61ccd0ddf 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -15,6 +15,7 @@ use Magento\Framework\Api\AttributeDataBuilder;
*
* @method int getParentId() getParentId()
* @method \Magento\Customer\Model\Address setParentId() setParentId(int $parentId)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Address extends \Magento\Customer\Model\Address\AbstractAddress
{
@@ -53,6 +54,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 088ac96e0d7..80c9a4f3576 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -26,6 +26,7 @@ use Magento\Framework\Api\AttributeDataBuilder;
* @method string getTelephone()
* @method string getPostcode()
* @method bool getShouldIgnoreValidation()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class AbstractAddress extends \Magento\Framework\Model\AbstractExtensibleModel
{
@@ -122,6 +123,7 @@ class AbstractAddress extends \Magento\Framework\Model\AbstractExtensibleModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -471,6 +473,7 @@ class AbstractAddress extends \Magento\Framework\Model\AbstractExtensibleModel
* @return AddressInterface
* @deprecated Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
* the instance of Api/Data/AddressInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
{
@@ -526,6 +529,8 @@ class AbstractAddress extends \Magento\Framework\Model\AbstractExtensibleModel
* Validate address attribute values
*
* @return bool|array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validate()
{
diff --git a/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php b/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php
index 3037a022188..0460e6912b7 100644
--- a/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php
@@ -40,6 +40,7 @@ class ContextPlugin
* @param callable $proceed
* @param \Magento\Framework\App\RequestInterface $request
* @return mixed
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundDispatch(
\Magento\Framework\App\Action\Action $subject,
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 98ac3c18bb2..e9c3424ab30 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -30,6 +30,10 @@ use Magento\Framework\Api\AttributeDataBuilder;
* @method Customer setPasswordHash($string)
* @method string getPasswordHash()
* @method string getConfirmation()
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
{
@@ -218,6 +222,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
* @param DataObjectProcessor $dataObjectProcessor
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -990,6 +995,8 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
* (i.e. its change is requested)
*
* @return bool|string[]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validate()
{
diff --git a/app/code/Magento/Customer/Model/Group.php b/app/code/Magento/Customer/Model/Group.php
index 699fa503a48..252ff3c86c4 100644
--- a/app/code/Magento/Customer/Model/Group.php
+++ b/app/code/Magento/Customer/Model/Group.php
@@ -77,6 +77,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
index e5c0978f140..78461578f47 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
@@ -8,6 +8,9 @@ namespace Magento\Customer\Model\Metadata\Form;
use Magento\Framework\Api\ArrayObjectSearch;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
abstract class AbstractData
{
/**
@@ -256,6 +259,8 @@ abstract class AbstractData
*
* @param string $value
* @return array|true
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _validateInputRule($value)
{
@@ -436,6 +441,7 @@ abstract class AbstractData
* Return is AJAX Request
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsAjaxRequest()
{
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Date.php b/app/code/Magento/Customer/Model/Metadata/Form/Date.php
index 6a1443c0d3d..3fae45000c5 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Date.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Date.php
@@ -21,6 +21,8 @@ class Date extends AbstractData
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validateValue($value)
{
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
index 2d8f7a9b78f..26a8fe7837b 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/File.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/File.php
@@ -11,6 +11,9 @@ use Magento\Framework\Filesystem;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Api\ArrayObjectSearch;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class File extends AbstractData
{
/**
@@ -54,6 +57,7 @@ class File extends AbstractData
* @param \Magento\Core\Model\File\Validator\NotProtectedExtension $fileValidator
* @param Filesystem $fileSystem
* @param UploaderFactory $uploaderFactory
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -77,6 +81,7 @@ class File extends AbstractData
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function extractValue(\Magento\Framework\App\RequestInterface $request)
{
@@ -193,6 +198,8 @@ class File extends AbstractData
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validateValue($value)
{
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Image.php b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
index 5527c99d8a0..01fc2145727 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Image.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
@@ -16,6 +16,8 @@ class Image extends File
*
* @param array $value
* @return string[]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _validateByRules($value)
{
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php b/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php
index 1e5e68afc1b..2ac504c8384 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Multiline.php
@@ -24,6 +24,7 @@ class Multiline extends Text
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function validateValue($value)
{
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
index 34802ae362c..320ad12aaa7 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Text.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
@@ -49,6 +49,8 @@ class Text extends AbstractData
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validateValue($value)
{
diff --git a/app/code/Magento/Customer/Model/Observer.php b/app/code/Magento/Customer/Model/Observer.php
index 2e26e532516..692055fddcb 100644
--- a/app/code/Magento/Customer/Model/Observer.php
+++ b/app/code/Magento/Customer/Model/Observer.php
@@ -150,6 +150,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function afterAddressSave($observer)
{
diff --git a/app/code/Magento/Customer/Model/Renderer/Region.php b/app/code/Magento/Customer/Model/Renderer/Region.php
index 10857235b49..ec146726bc2 100644
--- a/app/code/Magento/Customer/Model/Renderer/Region.php
+++ b/app/code/Magento/Customer/Model/Renderer/Region.php
@@ -55,6 +55,8 @@ class Region implements \Magento\Framework\Data\Form\Element\Renderer\RendererIn
/**
* @param AbstractElement $element
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function render(AbstractElement $element)
{
diff --git a/app/code/Magento/Customer/Model/Resource/AddressRepository.php b/app/code/Magento/Customer/Model/Resource/AddressRepository.php
index a775fdaf72d..a64724956f6 100644
--- a/app/code/Magento/Customer/Model/Resource/AddressRepository.php
+++ b/app/code/Magento/Customer/Model/Resource/AddressRepository.php
@@ -12,6 +12,9 @@ use Magento\Framework\Api\Search\FilterGroup;
use Magento\Framework\Api\SortOrder;
use Magento\Framework\Exception\InputException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class AddressRepository implements \Magento\Customer\Api\AddressRepositoryInterface
{
/**
diff --git a/app/code/Magento/Customer/Model/Resource/Customer.php b/app/code/Magento/Customer/Model/Resource/Customer.php
index a7599d3073a..c8bc8721747 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer.php
@@ -8,6 +8,7 @@ use Magento\Framework\Exception\InputException;
/**
* Customer entity resource model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
{
@@ -39,6 +40,7 @@ class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
* @param \Magento\Core\Model\Validator\Factory $validatorFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
@@ -183,6 +185,7 @@ class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
*
* @param \Magento\Customer\Model\Customer $customer
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _saveAddresses(\Magento\Customer\Model\Customer $customer)
{
diff --git a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
index d55b6b246ef..2a7a73df544 100644
--- a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
@@ -12,6 +12,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
/**
* Customer repository.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInterface
{
@@ -88,6 +89,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Customer\Model\CustomerFactory $customerFactory,
@@ -119,6 +121,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $passwordHash = null)
{
diff --git a/app/code/Magento/Customer/Model/Resource/Setup.php b/app/code/Magento/Customer/Model/Resource/Setup.php
index ff8aa012f12..342b96ca83e 100644
--- a/app/code/Magento/Customer/Model/Resource/Setup.php
+++ b/app/code/Magento/Customer/Model/Resource/Setup.php
@@ -46,6 +46,8 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
* Add customer attributes to customer forms
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function installCustomerForms()
{
@@ -113,6 +115,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
* Retrieve default entities: customer, customer_address
*
* @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getDefaultEntities()
{
diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php
index af41901242d..107993816f7 100644
--- a/app/code/Magento/Customer/Model/Session.php
+++ b/app/code/Magento/Customer/Model/Session.php
@@ -13,6 +13,7 @@ use Magento\Customer\Model\Resource\Customer as ResourceCustomer;
/**
* Customer session model
* @method string getNoReferer()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Session extends \Magento\Framework\Session\SessionManager
{
@@ -111,6 +112,7 @@ class Session extends \Magento\Framework\Session\SessionManager
* @param \Magento\Framework\App\Http\Context $httpContext
* @param CustomerRepositoryInterface $customerRepository
* @param GroupManagementInterface $groupManagement
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Request\Http $request,
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Address.php b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
index 68281aec5e6..b9e131decdd 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
@@ -4,6 +4,9 @@
*/
namespace Magento\CustomerImportExport\Model\Export;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
{
/**#@+
@@ -108,6 +111,7 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
* @param \Magento\CustomerImportExport\Model\Export\CustomerFactory $eavCustomerFactory
* @param \Magento\Customer\Model\Resource\Address\CollectionFactory $addressColFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
index 03f2d3b690c..9485c8e9f47 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
@@ -8,6 +8,7 @@ use Magento\CustomerImportExport\Model\Resource\Import\Customer\Storage;
/**
* Import entity abstract customer model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entity\AbstractEav
{
@@ -78,6 +79,7 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Helper\Data $coreData,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 207b214fad7..98c0f0f7be2 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -4,6 +4,10 @@
*/
namespace Magento\CustomerImportExport\Model\Import;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Address extends AbstractCustomer
{
/**#@+
@@ -225,6 +229,8 @@ class Address extends AbstractCustomer
* @param \Magento\Customer\Model\Resource\Address\Attribute\CollectionFactory $attributesFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param array $data
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Helper\Data $coreData,
@@ -450,6 +456,8 @@ class Address extends AbstractCustomer
*
* @param array $rowData
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _prepareDataForUpdate(array $rowData)
{
@@ -644,6 +652,8 @@ class Address extends AbstractCustomer
* @param array $rowData
* @param int $rowNumber
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _validateRowForUpdate(array $rowData, $rowNumber)
{
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index ed9807ec7c3..30497ebecd5 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -4,6 +4,9 @@
*/
namespace Magento\CustomerImportExport\Model\Import;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Customer extends AbstractCustomer
{
/**
@@ -127,6 +130,7 @@ class Customer extends AbstractCustomer
* @param \Magento\Customer\Model\Resource\Attribute\CollectionFactory $attrCollectionFactory
* @param \Magento\Customer\Model\CustomerFactory $customerFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Helper\Data $coreData,
@@ -276,6 +280,8 @@ class Customer extends AbstractCustomer
*
* @param array $rowData
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _prepareDataForUpdate(array $rowData)
{
@@ -365,6 +371,7 @@ class Customer extends AbstractCustomer
* Import data rows
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _importData()
{
@@ -432,6 +439,8 @@ class Customer extends AbstractCustomer
* @param array $rowData
* @param int $rowNumber
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _validateRowForUpdate(array $rowData, $rowNumber)
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Edit.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Edit.php
index 0a33cc3bef6..912533a479e 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Edit.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Edit.php
@@ -80,6 +80,7 @@ class Edit extends \Magento\Backend\Block\Widget\Button\SplitButton
* Whether button is disabled
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDisabled()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php
index 2337a4467a2..46eb8d60382 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php
@@ -78,6 +78,7 @@ class Save extends \Magento\Backend\Block\Widget\Button\SplitButton
* Whether button is disabled
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDisabled()
{
diff --git a/app/code/Magento/DesignEditor/Model/Observer.php b/app/code/Magento/DesignEditor/Model/Observer.php
index 2f26e057179..e9d80a493c0 100644
--- a/app/code/Magento/DesignEditor/Model/Observer.php
+++ b/app/code/Magento/DesignEditor/Model/Observer.php
@@ -47,6 +47,7 @@ class Observer
*
* @param EventObserver $event
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function clearJs(EventObserver $event)
{
diff --git a/app/code/Magento/DesignEditor/Model/Url/NavigationMode.php b/app/code/Magento/DesignEditor/Model/Url/NavigationMode.php
index 7e206ac327b..dae895c9d15 100644
--- a/app/code/Magento/DesignEditor/Model/Url/NavigationMode.php
+++ b/app/code/Magento/DesignEditor/Model/Url/NavigationMode.php
@@ -43,6 +43,7 @@ class NavigationMode extends \Magento\Framework\Url
* @param string $scopeType
* @param \Magento\DesignEditor\Helper\Data $helper
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index b81ffca5c10..77d2105726f 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -14,6 +14,9 @@ use Magento\Shipping\Model\Rate\Result;
/**
* DHL International (API v1.4)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shipping\Model\Carrier\CarrierInterface
{
@@ -206,6 +209,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
* @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -369,6 +373,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
*
* @param \Magento\Framework\Object $request
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function setRequest(\Magento\Framework\Object $request)
{
@@ -610,6 +616,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
*
* @param string $code One-symbol code (see getDhlProducts())
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDhlProductTitle($code)
{
@@ -656,6 +663,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
* Prepare items to pieces
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getAllItems()
{
@@ -746,6 +755,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
*
* @param \Magento\Shipping\Model\Simplexml\Element $nodeBkgDetails
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _makePieces(\Magento\Shipping\Model\Simplexml\Element $nodeBkgDetails)
{
@@ -1008,6 +1018,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
* @param string $response
* @return bool|\Magento\Framework\Object|Result|Error
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _parseResponse($response)
{
@@ -1095,6 +1107,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
*
* @param \SimpleXMLElement $shipmentDetails
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _addRate(\SimpleXMLElement $shipmentDetails)
{
@@ -1359,6 +1372,9 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
*
* @return Result|\Magento\Framework\Object
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _doRequest()
{
@@ -1552,6 +1568,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
* @param RateRequest $rawRequest
* @param string $originRegion
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
{
@@ -1740,6 +1758,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
* @param string[] $trackings
* @param string $response
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _parseXmlTrackingResponse($trackings, $response)
{
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
index 2d6d55fb71b..c5a29bbd2dd 100644
--- a/app/code/Magento/Directory/Model/Currency.php
+++ b/app/code/Magento/Directory/Model/Currency.php
@@ -13,6 +13,9 @@ namespace Magento\Directory\Model;
use Magento\Directory\Exception;
use Magento\Directory\Model\Currency\Filter;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Currency extends \Magento\Framework\Model\AbstractModel
{
/**
@@ -72,6 +75,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Directory/Model/Observer.php b/app/code/Magento/Directory/Model/Observer.php
index 98313020819..fd48d4d39da 100644
--- a/app/code/Magento/Directory/Model/Observer.php
+++ b/app/code/Magento/Directory/Model/Observer.php
@@ -83,6 +83,7 @@ class Observer
/**
* @param mixed $schedule
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function scheduledUpdateCurrencyRates($schedule)
{
diff --git a/app/code/Magento/Directory/Model/Resource/Country/Collection.php b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
index ed505ab7aa0..c382f1089b5 100644
--- a/app/code/Magento/Directory/Model/Resource/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
@@ -53,6 +53,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
diff --git a/app/code/Magento/Directory/Model/Resource/Currency.php b/app/code/Magento/Directory/Model/Resource/Currency.php
index 005d02081f3..38433b2fe5c 100644
--- a/app/code/Magento/Directory/Model/Resource/Currency.php
+++ b/app/code/Magento/Directory/Model/Resource/Currency.php
@@ -160,6 +160,7 @@ class Currency extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Directory\Model\Currency $model
* @param string $path
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getConfigCurrencies($model, $path)
{
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index b791971d023..795e86c40cf 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -8,6 +8,7 @@ namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Download
* Adminhtml catalog product downloadable items tab links section
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Links extends \Magento\Backend\Block\Template
{
@@ -87,6 +88,7 @@ class Links extends \Magento\Backend\Block\Template
* @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
* @param \Magento\Backend\Model\UrlFactory $urlFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
@@ -214,6 +216,7 @@ class Links extends \Magento\Backend\Block\Template
* Check exists defined links title
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUsedDefault()
{
@@ -224,6 +227,7 @@ class Links extends \Magento\Backend\Block\Template
* Return true if price in website scope
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsPriceWebsiteScope()
{
@@ -241,6 +245,8 @@ class Links extends \Magento\Backend\Block\Template
* Return array of links
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getLinkData()
{
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index b116af08262..6ccec440045 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -188,6 +188,7 @@ class Samples extends \Magento\Backend\Block\Widget
* Check exists defined samples title
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getUsedDefault()
{
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index eabb0c42254..d03a26d57a0 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -45,6 +45,7 @@ class Links extends \Magento\Catalog\Block\Product\AbstractProduct
* Enter description here...
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getLinksPurchasedSeparately()
{
@@ -53,6 +54,7 @@ class Links extends \Magento\Catalog\Block\Product\AbstractProduct
/**
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getLinkSelectionRequired()
{
@@ -136,6 +138,7 @@ class Links extends \Magento\Catalog\Block\Product\AbstractProduct
* Return true if target of link new window
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsOpenInNewWindow()
{
@@ -150,6 +153,7 @@ class Links extends \Magento\Catalog\Block\Product\AbstractProduct
*
* @param Link $link
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsLinkChecked($link)
{
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
index 13e5390b0dc..a8dd75adeb9 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
@@ -59,6 +59,7 @@ class Samples extends \Magento\Catalog\Block\Product\AbstractProduct
* Return true if target of link new window
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsOpenInNewWindow()
{
diff --git a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
index a7c54f2b7e7..0177d861e8f 100644
--- a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
@@ -32,6 +32,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
* @param \Magento\Downloadable\Helper\Catalog\Product\Configuration $downloadableProductConfiguration
* @param \Magento\Framework\Module\Manager $moduleManager
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Downloadable/Block/Checkout/Success.php b/app/code/Magento/Downloadable/Block/Checkout/Success.php
index dffdc9de9fa..d1416da1ab7 100644
--- a/app/code/Magento/Downloadable/Block/Checkout/Success.php
+++ b/app/code/Magento/Downloadable/Block/Checkout/Success.php
@@ -55,6 +55,7 @@ class Success extends \Magento\Checkout\Block\Onepage\Success
* Return true if order(s) has one or more downloadable products
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getOrderHasDownloadable()
{
diff --git a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
index bf1611da433..ef08619fa24 100644
--- a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
+++ b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
@@ -158,6 +158,7 @@ class ListProducts extends \Magento\Framework\View\Element\Template
* Return true if target of link new window
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsOpenInNewWindow()
{
diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php
index cf1c4d6270e..3f9078a77d4 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Link.php
@@ -25,6 +25,10 @@ class Link extends \Magento\Downloadable\Controller\Download
* Download link action
*
* @return void|ResponseInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function execute()
{
diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
index ea8f928caad..338dabc959b 100644
--- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
@@ -14,6 +14,7 @@ class LinkSample extends \Magento\Downloadable\Controller\Download
* Download link's sample action
*
* @return ResponseInterface
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function execute()
{
diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
index 72a761a8d96..9b4339df86d 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php
@@ -14,6 +14,7 @@ class Sample extends \Magento\Downloadable\Controller\Download
* Download sample action
*
* @return ResponseInterface
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function execute()
{
diff --git a/app/code/Magento/Downloadable/Helper/Data.php b/app/code/Magento/Downloadable/Helper/Data.php
index 7989aa76cce..15be28876fe 100644
--- a/app/code/Magento/Downloadable/Helper/Data.php
+++ b/app/code/Magento/Downloadable/Helper/Data.php
@@ -37,6 +37,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*
* @param \Magento\Downloadable\Model\Link|Item $link
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsShareable($link)
{
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index 937be7b750f..2efd55ef364 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -10,6 +10,7 @@ use Magento\Framework\Model\Exception as CoreException;
/**
* Downloadable Products Download Helper
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Download extends \Magento\Framework\App\Helper\AbstractHelper
{
@@ -293,6 +294,7 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
*
* @param mixed $store
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getContentDisposition($store = null)
{
diff --git a/app/code/Magento/Downloadable/Model/Observer.php b/app/code/Magento/Downloadable/Model/Observer.php
index bacac2047a5..e806b250077 100644
--- a/app/code/Magento/Downloadable/Model/Observer.php
+++ b/app/code/Magento/Downloadable/Model/Observer.php
@@ -10,6 +10,7 @@ use Magento\Store\Model\ScopeInterface;
* Downloadable Products Observer
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Observer
{
@@ -110,6 +111,8 @@ class Observer
*
* @param \Magento\Framework\Object $observer
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function saveDownloadableOrderItem($observer)
{
@@ -229,6 +232,8 @@ class Observer
*
* @param \Magento\Framework\Object $observer
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function setLinkStatus($observer)
{
diff --git a/app/code/Magento/Downloadable/Model/Product/Type.php b/app/code/Magento/Downloadable/Model/Product/Type.php
index 3fa35f6189e..28621b660e5 100644
--- a/app/code/Magento/Downloadable/Model/Product/Type.php
+++ b/app/code/Magento/Downloadable/Model/Product/Type.php
@@ -10,6 +10,7 @@ use Magento\Catalog\Api\ProductRepositoryInterface;
* Downloadable product type model
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Type extends \Magento\Catalog\Model\Product\Type\Virtual
{
@@ -72,6 +73,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
* @param \Magento\Downloadable\Model\Resource\Sample\CollectionFactory $samplesFactory
* @param \Magento\Downloadable\Model\SampleFactory $sampleFactory
* @param \Magento\Downloadable\Model\LinkFactory $linkFactory
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Catalog\Model\Product\Option $catalogProductOption,
@@ -186,6 +188,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
*
* @param \Magento\Catalog\Model\Product $product
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getLinkSelectionRequired($product)
{
@@ -228,6 +231,9 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
*
* @param \Magento\Catalog\Model\Product $product
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function save($product)
{
@@ -560,6 +566,8 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
* @param \Magento\Catalog\Model\Product $product
* @param string $processMode
* @return array|string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $product, $processMode)
{
diff --git a/app/code/Magento/Downloadable/Model/Resource/Link.php b/app/code/Magento/Downloadable/Model/Resource/Link.php
index b139ed4bcd8..67f9277325b 100644
--- a/app/code/Magento/Downloadable/Model/Resource/Link.php
+++ b/app/code/Magento/Downloadable/Model/Resource/Link.php
@@ -69,6 +69,7 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Downloadable\Model\Link $linkObject
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function saveItemTitleAndPrice($linkObject)
{
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
index 16dfe68a25a..21be2eae6bc 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -6,6 +6,7 @@ namespace Magento\Downloadable\Model\Sales\Order\Pdf\Items;
/**
* Order Downloadable Pdf Items renderer
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
{
@@ -45,6 +46,7 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
index 9c93337030f..9b7c23afe67 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -27,6 +27,7 @@ class Creditmemo extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\Abstr
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
index 05d4bf202a9..23a8bfb9e2e 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -27,6 +27,7 @@ class Invoice extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\Abstract
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -62,6 +63,7 @@ class Invoice extends \Magento\Downloadable\Model\Sales\Order\Pdf\Items\Abstract
* Draw item line
*
* @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function draw()
{
diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
index aecf21d851b..67501a88200 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
@@ -73,6 +73,7 @@ interface AttributeInterface extends \Magento\Framework\Api\ExtensibleDataInterf
* Whether attribute is required.
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsRequired();
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index f73acfcbc0c..b75bfeab278 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -99,6 +99,7 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
* Preparing default form elements for editing attribute
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
index f8a52ed7bde..27dff63da40 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
@@ -11,6 +11,7 @@ use Magento\Framework\Model\Exception as CoreException;
* EAV Attribute Abstract Data Model
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractData
{
@@ -284,6 +285,8 @@ abstract class AbstractData
*
* @param string $value
* @return string|true
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _validateInputRule($value)
{
@@ -478,6 +481,7 @@ abstract class AbstractData
* Return is AJAX Request
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsAjaxRequest()
{
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Date.php b/app/code/Magento/Eav/Model/Attribute/Data/Date.php
index 577265a546b..0d16c99b022 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Date.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Date.php
@@ -31,6 +31,8 @@ class Date extends \Magento\Eav\Model\Attribute\Data\AbstractData
*
* @param array|string $value
* @return bool|array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validateValue($value)
{
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/File.php b/app/code/Magento/Eav/Model/Attribute/Data/File.php
index 94b0e6ff1c6..df14a32799d 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/File.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/File.php
@@ -63,6 +63,7 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
*
* @param RequestInterface $request
* @return array|string|bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function extractValue(RequestInterface $request)
{
@@ -162,6 +163,8 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
*
* @param array|string $value
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validateValue($value)
{
@@ -204,6 +207,7 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
*
* @param array|string $value
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function compactValue($value)
{
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Image.php b/app/code/Magento/Eav/Model/Attribute/Data/Image.php
index 27cf808fe38..0efb736c45a 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Image.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Image.php
@@ -17,6 +17,8 @@ class Image extends \Magento\Eav\Model\Attribute\Data\File
*
* @param array $value
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _validateByRules($value)
{
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index e32506f45dd..2d6351af856 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -52,6 +52,8 @@ class Text extends \Magento\Eav\Model\Attribute\Data\AbstractData
*
* @param array|string $value
* @return bool|array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validateValue($value)
{
diff --git a/app/code/Magento/Eav/Model/AttributeRepository.php b/app/code/Magento/Eav/Model/AttributeRepository.php
index 7b2b69dd5f8..9809fb35dff 100644
--- a/app/code/Magento/Eav/Model/AttributeRepository.php
+++ b/app/code/Magento/Eav/Model/AttributeRepository.php
@@ -11,6 +11,9 @@ use Magento\Framework\Exception\InputException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Exception\StateException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class AttributeRepository implements \Magento\Eav\Api\AttributeRepositoryInterface
{
/**
diff --git a/app/code/Magento/Eav/Model/AttributeSetRepository.php b/app/code/Magento/Eav/Model/AttributeSetRepository.php
index 2bd27a9f844..6c94aa59043 100644
--- a/app/code/Magento/Eav/Model/AttributeSetRepository.php
+++ b/app/code/Magento/Eav/Model/AttributeSetRepository.php
@@ -15,6 +15,9 @@ use Magento\Framework\Exception\CouldNotDeleteException;
use Magento\Framework\Exception\CouldNotSaveException;
use Magento\Framework\Exception\NoSuchEntityException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class AttributeSetRepository implements AttributeSetRepositoryInterface
{
/**
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
index fbf4c5faa90..b3b3f9b5249 100644
--- a/app/code/Magento/Eav/Model/Config.php
+++ b/app/code/Magento/Eav/Model/Config.php
@@ -6,6 +6,9 @@ namespace Magento\Eav\Model;
use Magento\Eav\Model\Entity\Type;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Config
{
/**#@+
@@ -449,6 +452,8 @@ class Config
* @param mixed $entityType
* @param \Magento\Framework\Object $object
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getEntityAttributeCodes($entityType, $object = null)
{
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index 5d67832a960..aab51c7333d 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -16,6 +16,9 @@ use Magento\Framework\Model\Exception;
* Entity/Attribute/Model - entity abstract
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractEntity extends \Magento\Framework\Model\Resource\AbstractResource implements EntityInterface
{
@@ -413,6 +416,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
*
* @param string|int|Element $attribute
* @return AbstractAttribute|false
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getAttribute($attribute)
{
@@ -636,6 +640,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
* @param \Magento\Framework\Object $object
* @param AbstractAttribute $attribute
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _isApplicableAttribute($object, $attribute)
{
@@ -656,6 +661,8 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
*
* @throws \Exception|\Magento\Eav\Model\Entity\Attribute\Exception
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function walkAttributes($partMethod, array $args = [], $collectExceptionMessages = null)
{
@@ -738,6 +745,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
* @param string $method
* @param array $args array of arguments
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _isCallableAttributeInstance($instance, $method, $args)
{
@@ -1079,6 +1087,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
* @param \Magento\Framework\Object $object
* @param string|int $rowId
* @return \Zend_Db_Select
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getLoadRowSelect($object, $rowId)
{
@@ -1224,6 +1233,8 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
*
* @param \Magento\Framework\Object $newObject
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _collectSaveData($newObject)
{
@@ -1328,6 +1339,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
* @param mixed $v New value of the attribute. Can be used in subclasses.
* @param array $origData
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _canUpdateAttribute(AbstractAttribute $attribute, $v, array &$origData)
{
@@ -1382,6 +1394,8 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
*
* @param array $saveData array('newObject', 'entityRow', 'insert', 'update', 'delete')
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _processSaveData($saveData)
{
@@ -1491,6 +1505,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
* @param mixed $valueId
* @param mixed $value
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _updateAttribute($object, $attribute, $valueId, $value)
{
@@ -1581,6 +1596,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
* @param string $table
* @param array $info
* @return \Magento\Framework\Object
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _deleteAttributes($object, $table, $info)
{
@@ -1609,6 +1625,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
* @param string $attributeCode
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function saveAttribute(\Magento\Framework\Object $object, $attributeCode)
{
@@ -1665,6 +1682,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
* @param \Magento\Framework\Object|int|string $object
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function delete($object)
{
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 7c0e627b566..e9438a6f0ca 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -11,6 +11,7 @@ use Magento\Framework\Api\AttributeDataBuilder;
* EAV Entity attribute model
*
* @method \Magento\Eav\Model\Entity\Attribute setOption($value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute implements
\Magento\Framework\Object\IdentityInterface
@@ -79,6 +80,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -207,6 +209,8 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
*
* @return $this
* @throws Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function beforeSave()
{
@@ -306,6 +310,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
*
* @param string $type frontend_input field value
* @return string backend_type field value
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getBackendTypeByInput($type)
{
@@ -349,6 +354,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
*
* @param string $type frontend_input field name
* @return string default_value field value
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getDefaultValueByInput($type)
{
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 00afe4c579c..d18a6e3ee89 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -9,6 +9,9 @@ use Magento\Framework\Api\AttributeDataBuilder;
/**
* Entity/Attribute/Model - attribute abstract
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtensibleModel implements
AttributeInterface,
@@ -117,6 +120,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -299,6 +303,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsVisibleOnFront()
{
@@ -656,6 +661,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
* Retrieve flat columns DDL definition
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function _getFlatColumnsDdlDefinition()
{
@@ -739,6 +745,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
* Used in database compatible mode
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _getFlatColumnsOldDefinition()
{
@@ -813,6 +820,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
* Retrieve index data for flat table
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getFlatIndexes()
{
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
index ee0ceebd3f2..d3a56cdde9f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
@@ -6,6 +6,7 @@ namespace Magento\Eav\Model\Entity\Attribute\Backend;
/**
* Entity/Attribute/Model - attribute backend abstract
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Backend\BackendInterface
{
@@ -211,6 +212,7 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
* @param \Magento\Framework\Object $object
* @throws \Magento\Eav\Exception
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function validate($object)
{
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
index 89d1db9f164..eb71650008c 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
@@ -21,6 +21,9 @@ namespace Magento\Eav\Model\Entity\Attribute;
use Magento\Eav\Model\Entity\Type;
use Magento\Framework\Api\AttributeDataBuilder;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Set extends \Magento\Framework\Model\AbstractExtensibleModel implements
\Magento\Eav\Api\Data\AttributeSetInterface
{
@@ -69,6 +72,7 @@ class Set extends \Magento\Framework\Model\AbstractExtensibleModel implements
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -155,6 +159,8 @@ class Set extends \Magento\Framework\Model\AbstractExtensibleModel implements
*
* @param array $data
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function organizeData($data)
{
@@ -262,6 +268,7 @@ class Set extends \Magento\Framework\Model\AbstractExtensibleModel implements
* @param array $attributes
* @param int $setId
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addSetInfo($entityType, array $attributes, $setId = null)
{
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
index 629eabe56de..9bf0583788c 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
@@ -8,6 +8,7 @@ namespace Magento\Eav\Model\Entity\Attribute\Source;
* Entity/Attribute/Model - attribute selection source abstract
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractSource implements
\Magento\Eav\Model\Entity\Attribute\Source\SourceInterface,
@@ -93,6 +94,7 @@ abstract class AbstractSource implements
* @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
* @param string $dir direction
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function addValueSortToCollection($collection, $dir = \Magento\Framework\Data\Collection::SORT_ORDER_DESC)
{
@@ -124,6 +126,7 @@ abstract class AbstractSource implements
*
* @param int $store
* @return \Magento\Framework\DB\Select|null
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getFlatUpdateSelect($store)
{
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index 9c10fc846bc..638a00a42b8 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -8,6 +8,9 @@ use Magento\Framework\DB\Select;
/**
* Entity/Attribute/Model - collection abstract
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
{
@@ -124,6 +127,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param mixed $connection
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
@@ -619,6 +623,8 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
* @param null $storeId
* @return $this
* @throws \Magento\Eav\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinType = 'inner', $storeId = null)
{
@@ -769,6 +775,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
* @param string $joinType
* @return $this
* @throws \Magento\Eav\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function joinTable($table, $bind, $fields = null, $cond = null, $joinType = 'inner')
{
@@ -1096,6 +1103,9 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
* @param bool $logQuery
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function _loadAttributes($printQuery = false, $logQuery = false)
{
@@ -1185,6 +1195,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
* @param string $table
* @param string $type
* @return Select
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _addLoadAttributesSelectValues($select, $table, $type)
{
@@ -1281,6 +1292,7 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
* @param string $joinType inner|left
* @return $this
* @throws \Magento\Eav\Exception
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _addAttributeJoin($attributeCode, $joinType = 'inner')
{
diff --git a/app/code/Magento/Eav/Model/Entity/Setup.php b/app/code/Magento/Eav/Model/Entity/Setup.php
index 3508beb572f..7139001f1fb 100644
--- a/app/code/Magento/Eav/Model/Entity/Setup.php
+++ b/app/code/Magento/Eav/Model/Entity/Setup.php
@@ -6,6 +6,9 @@
*/
namespace Magento\Eav\Model\Entity;
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
class Setup extends \Magento\Framework\Module\DataSetup
{
/**
@@ -767,6 +770,7 @@ class Setup extends \Magento\Framework\Module\DataSetup
* @param array $option
* @return void
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addAttributeOption($option)
{
@@ -1216,6 +1220,8 @@ class Setup extends \Magento\Framework\Module\DataSetup
*
* @param array $entities
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function installEntities($entities = null)
{
diff --git a/app/code/Magento/Eav/Model/Entity/Setup/Context.php b/app/code/Magento/Eav/Model/Entity/Setup/Context.php
index b08b99d84ab..d56ba528295 100644
--- a/app/code/Magento/Eav/Model/Entity/Setup/Context.php
+++ b/app/code/Magento/Eav/Model/Entity/Setup/Context.php
@@ -24,6 +24,7 @@ class Context extends \Magento\Framework\Module\Setup\Context
* @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
* @param \Magento\Framework\Filesystem $filesystem
* @param PropertyMapperInterface $attributeMapper
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Psr\Log\LoggerInterface $logger,
diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index ba2384d612e..eb872ed481d 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -10,6 +10,8 @@ use Magento\Framework\App\RequestInterface;
* EAV Entity Form Model
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class Form
{
@@ -576,6 +578,7 @@ abstract class Form
* Return is AJAX Request
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsAjaxRequest()
{
diff --git a/app/code/Magento/Eav/Model/Resource/Attribute.php b/app/code/Magento/Eav/Model/Resource/Attribute.php
index 97c9ce0d223..6fff6258ef5 100644
--- a/app/code/Magento/Eav/Model/Resource/Attribute.php
+++ b/app/code/Magento/Eav/Model/Resource/Attribute.php
@@ -85,6 +85,7 @@ abstract class Attribute extends \Magento\Eav\Model\Resource\Entity\Attribute
*
* @param \Magento\Framework\Model\AbstractModel $object
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _afterSave(AbstractModel $object)
{
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
index 3f2130ec932..bf5ce786c43 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
@@ -260,6 +260,7 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param null $attributeGroupId
* @param null $attributeSortOrder
* @return $this
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function saveInSetIncluding(
AbstractModel $object,
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Fieldset.php b/app/code/Magento/Eav/Model/Resource/Form/Fieldset.php
index c56d8edbff2..ed974e100ab 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Fieldset.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Fieldset.php
@@ -33,6 +33,8 @@ class Fieldset extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param FormFieldset|AbstractModel $object
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _afterSave(AbstractModel $object)
{
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index 7f5c390ed91..42e80b5d504 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -12,6 +12,8 @@ use Magento\Shipping\Model\Rate\Result;
* Fedex shipping implementation
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\Carrier\CarrierInterface
{
@@ -252,6 +254,8 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @param RateRequest $request
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function setRequest(RateRequest $request)
{
@@ -492,6 +496,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @param mixed $response
* @return Result
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareRateResponse($response)
{
@@ -689,6 +694,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @param mixed $response
* @return Result
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _parseXmlResponse($response)
{
@@ -777,6 +783,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
* @param string $type
* @param string $code
* @return array|false
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getCode($type, $code = '')
{
@@ -1047,6 +1054,9 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
* @param string[] $trackingValue
* @param \stdClass $response
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _parseTrackingResponse($trackingValue, $response)
{
@@ -1222,6 +1232,9 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @param \Magento\Framework\Object $request
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _formShipmentRequest(\Magento\Framework\Object $request)
{
@@ -1451,6 +1464,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @param \Magento\Framework\Object|null $params
* @return array|bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getContainerTypes(\Magento\Framework\Object $params = null)
{
diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
index c6ef06601da..5fe409ac127 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -274,6 +274,7 @@ class Inline extends \Magento\Framework\View\Element\Template
* Check if items has messages
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getItemsHasMesssages()
{
@@ -289,6 +290,7 @@ class Inline extends \Magento\Framework\View\Element\Template
* Check if entity has message
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getEntityHasMessage()
{
diff --git a/app/code/Magento/GiftMessage/Helper/Message.php b/app/code/Magento/GiftMessage/Helper/Message.php
index b8cc61374ba..31045f4063e 100644
--- a/app/code/Magento/GiftMessage/Helper/Message.php
+++ b/app/code/Magento/GiftMessage/Helper/Message.php
@@ -6,6 +6,7 @@ namespace Magento\GiftMessage\Helper;
/**
* Gift Message helper
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Message extends \Magento\Core\Helper\Data
{
@@ -70,6 +71,7 @@ class Message extends \Magento\Core\Helper\Data
* @param \Magento\Framework\Escaper $escaper
* @param array $skipMessageCheck
* @param bool $dbCompatibleMode
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
@@ -135,6 +137,7 @@ class Message extends \Magento\Core\Helper\Data
* @param \Magento\Framework\Object $entity
* @param \Magento\Store\Model\Store|int|null $store
* @return bool|string|null
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $store = null)
{
@@ -287,6 +290,7 @@ class Message extends \Magento\Core\Helper\Data
* @param array $quote
* @param \Magento\Store\Model\Store|int|null $store
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getAvailableForQuoteItems($quote, $store = null)
{
@@ -304,6 +308,7 @@ class Message extends \Magento\Core\Helper\Data
* @param array $items
* @param \Magento\Store\Model\Store|int|null $store
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getAvailableForAddressItems($items, $store = null)
{
diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageManager.php b/app/code/Magento/GiftMessage/Model/GiftMessageManager.php
index 7eb71725830..6e48caa5424 100644
--- a/app/code/Magento/GiftMessage/Model/GiftMessageManager.php
+++ b/app/code/Magento/GiftMessage/Model/GiftMessageManager.php
@@ -24,6 +24,7 @@ class GiftMessageManager
* @param array $giftMessages
* @param \Magento\Sales\Model\Quote $quote
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function add($giftMessages, $quote)
{
diff --git a/app/code/Magento/GiftMessage/Model/Save.php b/app/code/Magento/GiftMessage/Model/Save.php
index 4ede29a1aaf..22a04f2aa32 100644
--- a/app/code/Magento/GiftMessage/Model/Save.php
+++ b/app/code/Magento/GiftMessage/Model/Save.php
@@ -79,6 +79,7 @@ class Save extends \Magento\Framework\Object
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getSaved()
{
@@ -242,6 +243,7 @@ class Save extends \Magento\Framework\Object
*
* @param \Magento\Framework\Object $item
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsAllowedQuoteItem($item)
{
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php
index a99f6afb3c6..b9cb7c6a684 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php
@@ -6,6 +6,9 @@
*/
namespace Magento\GoogleOptimizer\Block\Adminhtml\Catalog\Category\Edit\Tab;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Googleoptimizer extends \Magento\Catalog\Block\Adminhtml\Form
{
/**
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Form.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Form.php
index f374451ed0a..21be4393ceb 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Form.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Form.php
@@ -70,6 +70,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
* @param \Magento\GoogleShopping\Helper\Category $googleShoppingCategory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Save.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Save.php
index f2ee9b58d4b..c207fc6b0e2 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Save.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types/Save.php
@@ -11,6 +11,7 @@ class Save extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\T
* Save attribute set mapping
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/GoogleShopping/Helper/Data.php b/app/code/Magento/GoogleShopping/Helper/Data.php
index e2fd1a3ccf1..4a80b78c595 100644
--- a/app/code/Magento/GoogleShopping/Helper/Data.php
+++ b/app/code/Magento/GoogleShopping/Helper/Data.php
@@ -85,6 +85,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param string $message \Exception message to parse
* @param null|\Magento\Catalog\Model\Product $product
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function parseGdataExceptionMessage($message, $product = null)
{
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute.php b/app/code/Magento/GoogleShopping/Model/Attribute.php
index 9778f83d3a8..d6be813d765 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute.php
@@ -108,6 +108,7 @@ class Attribute extends \Magento\Framework\Model\AbstractModel
*
* @param int $setId attribute set id
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getAllowedAttributes($setId)
{
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/ContentLanguage.php b/app/code/Magento/GoogleShopping/Model/Attribute/ContentLanguage.php
index b897703bf7f..ab3c3937f2a 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/ContentLanguage.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/ContentLanguage.php
@@ -29,6 +29,7 @@ class ContentLanguage extends \Magento\GoogleShopping\Model\Attribute\DefaultAtt
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/DefaultAttribute.php b/app/code/Magento/GoogleShopping/Model/Attribute/DefaultAttribute.php
index 66c3a063e55..c0ed3c62b4d 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/DefaultAttribute.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/DefaultAttribute.php
@@ -10,6 +10,9 @@
*/
namespace Magento\GoogleShopping\Model\Attribute;
+/**
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
class DefaultAttribute extends \Magento\GoogleShopping\Model\Attribute
{
/**
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Destinations.php b/app/code/Magento/GoogleShopping/Model/Attribute/Destinations.php
index 697b4e91e39..168bba47892 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Destinations.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Destinations.php
@@ -29,6 +29,7 @@ class Destinations extends \Magento\GoogleShopping\Model\Attribute\DefaultAttrib
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/GoogleProductCategory.php b/app/code/Magento/GoogleShopping/Model/Attribute/GoogleProductCategory.php
index 77ff5bcee7b..44afff6961c 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/GoogleProductCategory.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/GoogleProductCategory.php
@@ -37,6 +37,7 @@ class GoogleProductCategory extends \Magento\GoogleShopping\Model\Attribute\Defa
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/ImageLink.php b/app/code/Magento/GoogleShopping/Model/Attribute/ImageLink.php
index 0fb5cbf6b13..ea1fc39e98a 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/ImageLink.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/ImageLink.php
@@ -27,6 +27,7 @@ class ImageLink extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
* @param \Magento\Catalog\Helper\Product $catalogProduct
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
index b8aabde6928..2676b9ca32f 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
@@ -27,6 +27,7 @@ class Link extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/ProductType.php b/app/code/Magento/GoogleShopping/Model/Attribute/ProductType.php
index 44a6ddd9f46..8f7efe7ad83 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/ProductType.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/ProductType.php
@@ -29,6 +29,7 @@ class ProductType extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribu
* @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDate.php b/app/code/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDate.php
index bd443169180..2a1af27f176 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDate.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDate.php
@@ -18,6 +18,8 @@ class SalePriceEffectiveDate extends \Magento\GoogleShopping\Model\Attribute\Def
* @param \Magento\Catalog\Model\Product $product
* @param \Magento\Framework\Gdata\Gshopping\Entry $entry
* @return \Magento\Framework\Gdata\Gshopping\Entry
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function convertAttribute($product, $entry)
{
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/TargetCountry.php b/app/code/Magento/GoogleShopping/Model/Attribute/TargetCountry.php
index 4d5672ca111..09dcc471863 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/TargetCountry.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/TargetCountry.php
@@ -29,6 +29,7 @@ class TargetCountry extends \Magento\GoogleShopping\Model\Attribute\DefaultAttri
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Tax.php b/app/code/Magento/GoogleShopping/Model/Attribute/Tax.php
index af7acb94ddc..9f683c69bc2 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Tax.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Tax.php
@@ -12,6 +12,7 @@ use Magento\Tax\Api\Data\TaxClassKeyInterface;
* Tax attribute model
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Tax extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
{
@@ -92,6 +93,7 @@ class Tax extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
* @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/GoogleShopping/Model/Config.php b/app/code/Magento/GoogleShopping/Model/Config.php
index 3840d0d4794..41be2b38879 100644
--- a/app/code/Magento/GoogleShopping/Model/Config.php
+++ b/app/code/Magento/GoogleShopping/Model/Config.php
@@ -243,6 +243,7 @@ class Config extends \Magento\Framework\Object
* where: key - attribute name, value - group name
*
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getAttributeGroupsFlat()
{
@@ -271,6 +272,7 @@ class Config extends \Magento\Framework\Object
*
* @param int $storeId
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsDebug($storeId)
{
@@ -281,6 +283,7 @@ class Config extends \Magento\Framework\Object
* Returns all required attributes
*
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getRequiredAttributes()
{
diff --git a/app/code/Magento/GoogleShopping/Model/MassOperations.php b/app/code/Magento/GoogleShopping/Model/MassOperations.php
index 52c6f69d1e9..62cf5d985e4 100644
--- a/app/code/Magento/GoogleShopping/Model/MassOperations.php
+++ b/app/code/Magento/GoogleShopping/Model/MassOperations.php
@@ -11,6 +11,7 @@ use Magento\GoogleShopping\Model\Resource\Item\Collection as ItemCollection;
* Controller for mass opertions with items
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class MassOperations
{
@@ -73,6 +74,7 @@ class MassOperations
* @param \Magento\GoogleShopping\Helper\Data $gleShoppingData
* @param \Magento\GoogleShopping\Helper\Category $gleShoppingCategory
* @param array $data
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
\Magento\GoogleShopping\Model\Resource\Item\CollectionFactory $collectionFactory,
@@ -142,6 +144,8 @@ class MassOperations
* @param int $storeId
* @return $this
* @throws \Exception|\Zend_Gdata_App_CaptchaRequiredException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addProducts($productIds, $storeId)
{
@@ -216,6 +220,7 @@ class MassOperations
* @param int[]|ItemCollection $items
* @return $this
* @throws \Exception|\Zend_Gdata_App_CaptchaRequiredException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function synchronizeItems($items)
{
@@ -302,6 +307,7 @@ class MassOperations
* @param int[]|ItemCollection $items
* @return $this
* @throws \Exception|\Zend_Gdata_App_CaptchaRequiredException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function deleteItems($items)
{
diff --git a/app/code/Magento/GoogleShopping/Model/Observer.php b/app/code/Magento/GoogleShopping/Model/Observer.php
index dd411a80fde..66f98825561 100644
--- a/app/code/Magento/GoogleShopping/Model/Observer.php
+++ b/app/code/Magento/GoogleShopping/Model/Observer.php
@@ -145,6 +145,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function checkSynchronizationOperations(\Magento\Framework\Event\Observer $observer)
{
diff --git a/app/code/Magento/GoogleShopping/Model/Resource/Attribute/Collection.php b/app/code/Magento/GoogleShopping/Model/Resource/Attribute/Collection.php
index 99148fa0d91..e2eb66de035 100644
--- a/app/code/Magento/GoogleShopping/Model/Resource/Attribute/Collection.php
+++ b/app/code/Magento/GoogleShopping/Model/Resource/Attribute/Collection.php
@@ -93,6 +93,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* Get flag - whether to join attribute_set_id to attributes or not
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getJoinAttributeSetFlag()
{
diff --git a/app/code/Magento/GoogleShopping/Model/Type.php b/app/code/Magento/GoogleShopping/Model/Type.php
index 6847685945e..cabda5ee7ec 100644
--- a/app/code/Magento/GoogleShopping/Model/Type.php
+++ b/app/code/Magento/GoogleShopping/Model/Type.php
@@ -63,6 +63,7 @@ class Type extends \Magento\Framework\Model\AbstractModel
* @param \Magento\GoogleShopping\Model\Resource\Type $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -110,6 +111,7 @@ class Type extends \Magento\Framework\Model\AbstractModel
* @param CatalogModelProduct $product
* @param Entry $entry
* @return Entry
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function convertProductToEntry($product, $entry)
{
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index a168d8d6fb4..5b0df239bac 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -209,6 +209,7 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
* @param Attribute $attribute
* @param mixed $value
* @return string
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
{
@@ -322,6 +323,7 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
* @param \Magento\Framework\Object $column
* @param boolean $isExport
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function decorateFilter($value, Attribute $row, \Magento\Framework\Object $column, $isExport)
{
diff --git a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
index fe1e1e4a60e..413e85568c8 100644
--- a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
@@ -10,6 +10,7 @@ use Magento\ImportExport\Model\Export\Adapter\AbstractAdapter;
* Export entity abstract model
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
abstract class AbstractEntity
{
@@ -159,6 +160,7 @@ abstract class AbstractEntity
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php b/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php
index 053bf2e396e..74d161bcfea 100644
--- a/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php
+++ b/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php
@@ -108,6 +108,7 @@ abstract class AbstractAdapter
*
* @param array $headerColumns
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setHeaderCols(array $headerColumns)
{
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index 1773db16576..3feec0b42d5 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -13,6 +13,7 @@ use Magento\Store\Model\Store;
* Export EAV entity abstract model
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEntity
{
@@ -153,6 +154,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
*
* @param AbstractCollection $collection
* @return AbstractCollection
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function filterEntityCollection(AbstractCollection $collection)
{
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
index 837b5d2a405..349e14d81d7 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -10,6 +10,8 @@ use Magento\ImportExport\Model\Export\Adapter\AbstractAdapter;
* Export entity abstract model
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractEntity
{
@@ -243,6 +245,7 @@ abstract class AbstractEntity
*
* @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
* @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection\AbstractCollection $collection)
{
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 37f63e1ce29..00d0d4e6710 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -14,6 +14,7 @@ use Magento\Framework\HTTP\Adapter\FileTransferFactory;
*
* @method string getBehavior() getBehavior()
* @method \Magento\ImportExport\Model\Import setEntity() setEntity(string $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Import extends \Magento\ImportExport\Model\AbstractModel
{
@@ -123,6 +124,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
* @param Source\Import\Behavior\Factory $behaviorFactory
* @param \Magento\Indexer\Model\IndexerRegistry $indexerRegistry
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Psr\Log\LoggerInterface $logger,
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
index c7774999109..9963b129b1c 100644
--- a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
@@ -7,6 +7,8 @@ namespace Magento\ImportExport\Model\Import;
/**
* Import entity abstract model
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractEntity
{
@@ -243,6 +245,7 @@ abstract class AbstractEntity
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\App\Resource $resource
* @param array $data
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function __construct(
\Magento\Core\Helper\Data $coreData,
@@ -318,6 +321,8 @@ abstract class AbstractEntity
* Validate data rows and save bunches to DB
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _saveValidatedBunches()
{
@@ -595,6 +600,7 @@ abstract class AbstractEntity
* @param array $rowData Row data
* @param int $rowNumber
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isAttributeValid($attributeCode, array $attributeParams, array $rowData, $rowNumber)
{
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
index 7593e4170c3..461435dc8c0 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
@@ -6,6 +6,7 @@ namespace Magento\ImportExport\Model\Import\Entity;
/**
* Import EAV entity abstract model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEntity
{
@@ -81,6 +82,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Helper\Data $coreData,
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index 44b33d95dfd..f169d27c785 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -8,6 +8,8 @@ use Magento\ImportExport\Model\Import\AbstractSource;
/**
* Import entity abstract model
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractEntity
{
@@ -256,6 +258,7 @@ abstract class AbstractEntity
*
* @param array $rowData
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _isRowScopeDefault(array $rowData)
{
@@ -287,6 +290,7 @@ abstract class AbstractEntity
* Validate data rows and save bunches to DB.
*
* @return $this|void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _saveValidatedBunches()
{
@@ -573,6 +577,7 @@ abstract class AbstractEntity
* @param array $rowData Row data
* @param int $rowNum
* @return boolean
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isAttributeValid($attrCode, array $attrParams, array $rowData, $rowNum)
{
diff --git a/app/code/Magento/Indexer/Model/Processor/InvalidateCache.php b/app/code/Magento/Indexer/Model/Processor/InvalidateCache.php
index 2332ef4f494..8fdbc4e5f93 100644
--- a/app/code/Magento/Indexer/Model/Processor/InvalidateCache.php
+++ b/app/code/Magento/Indexer/Model/Processor/InvalidateCache.php
@@ -45,6 +45,7 @@ class InvalidateCache
*
* @param \Magento\Indexer\Model\Processor $subject
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterUpdateMview(\Magento\Indexer\Model\Processor $subject)
{
diff --git a/app/code/Magento/Log/Model/Aggregation.php b/app/code/Magento/Log/Model/Aggregation.php
index 8e442004aad..eda1d103385 100644
--- a/app/code/Magento/Log/Model/Aggregation.php
+++ b/app/code/Magento/Log/Model/Aggregation.php
@@ -74,6 +74,7 @@ class Aggregation extends \Magento\Framework\Model\AbstractModel
*
* @param string $lastDate
* @return null|void
+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
*/
private function _removeEmpty($lastDate)
{
@@ -185,6 +186,7 @@ class Aggregation extends \Magento\Framework\Model\AbstractModel
* @param int|string $in
* @param null $offset
* @return bool|string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
private function _date($in, $offset = null)
{
@@ -201,6 +203,7 @@ class Aggregation extends \Magento\Framework\Model\AbstractModel
* @param int|string $in
* @param null $offset
* @return int
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
private function _timestamp($in, $offset = null)
{
diff --git a/app/code/Magento/Log/Model/Cron.php b/app/code/Magento/Log/Model/Cron.php
index bce6876887a..7b68c92d951 100644
--- a/app/code/Magento/Log/Model/Cron.php
+++ b/app/code/Magento/Log/Model/Cron.php
@@ -65,6 +65,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Log/Model/Resource/Log.php b/app/code/Magento/Log/Model/Resource/Log.php
index 66a49e747df..c93d8f2061f 100644
--- a/app/code/Magento/Log/Model/Resource/Log.php
+++ b/app/code/Magento/Log/Model/Resource/Log.php
@@ -130,6 +130,7 @@ class Log extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param int $time
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _cleanCustomers($time)
{
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Collection.php b/app/code/Magento/Log/Model/Resource/Visitor/Collection.php
index f598505ded5..210351bc982 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Collection.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Collection.php
@@ -172,6 +172,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* Return true if online filter used
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsOnlineFilterUsed()
{
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online.php b/app/code/Magento/Log/Model/Resource/Visitor/Online.php
index cbff21f7575..be4001bac13 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Online.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Online.php
@@ -42,6 +42,7 @@ class Online extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Log\Model\Visitor\Online $object
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function prepare(\Magento\Log\Model\Visitor\Online $object)
{
diff --git a/app/code/Magento/Log/Model/Visitor.php b/app/code/Magento/Log/Model/Visitor.php
index ea33af37a29..ff5db6d935e 100644
--- a/app/code/Magento/Log/Model/Visitor.php
+++ b/app/code/Magento/Log/Model/Visitor.php
@@ -62,6 +62,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index 7c8a80de9d6..58df0b6f29b 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -132,6 +132,7 @@ class Overview extends \Magento\Sales\Block\Items\AbstractItems
/**
* @param Address $address
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getShippingAddressRate($address)
{
diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php
index 5bfb025ff08..9b7e1115314 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout.php
@@ -10,6 +10,7 @@ use Magento\Framework\App\RequestInterface;
/**
* Multishipping checkout controller
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Checkout extends \Magento\Checkout\Controller\Action implements
\Magento\Checkout\Controller\Express\RedirectLoginInterface
@@ -76,6 +77,8 @@ class Checkout extends \Magento\Checkout\Controller\Action implements
*
* @param RequestInterface $request
* @return \Magento\Framework\App\ResponseInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function dispatch(RequestInterface $request)
{
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index 22b3cad9e9a..e37aa9e5d40 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -42,6 +42,7 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
* Overview action
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 7a514c4e030..f8366b4b746 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -10,6 +10,9 @@ use Magento\Sales\Model\Order\Email\Sender\OrderSender;
/**
* Multishipping checkout model
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Multishipping extends \Magento\Framework\Object
{
@@ -130,6 +133,7 @@ class Multishipping extends \Magento\Framework\Object
* @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
* @param \Magento\Framework\Api\FilterBuilder $filterBuilder,
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Checkout\Model\Session $checkoutSession,
@@ -177,6 +181,7 @@ class Multishipping extends \Magento\Framework\Object
* Split virtual/not virtual items between default billing/shipping addresses
*
* @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _init()
{
@@ -336,6 +341,8 @@ class Multishipping extends \Magento\Framework\Object
* @param array $info
* @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function setShippingItemsInformation($info)
{
@@ -419,6 +426,8 @@ class Multishipping extends \Magento\Framework\Object
* @param int $quoteItemId
* @param array $data array('qty'=>$qty, 'address'=>$customerAddressId)
* @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _addShippingItem($quoteItemId, $data)
{
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php
index 620deff6270..b22970e595d 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php
@@ -143,6 +143,7 @@ class State extends \Magento\Framework\Object
*
* @param string $step
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCompleteStep($step)
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
index 753ce3d1f00..bbc94dc134a 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
@@ -39,6 +39,7 @@ class Problem extends \Magento\Backend\Block\Template
/**
* @return void
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _construct()
{
@@ -100,6 +101,7 @@ class Problem extends \Magento\Backend\Block\Template
* Return true if the size is greater than 0
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getShowButtons()
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
index 92fe714575f..59ec0aa1ef8 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
@@ -217,6 +217,7 @@ class Edit extends \Magento\Backend\Block\Template
* Getter for availability preview mode
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsPreview()
{
@@ -240,6 +241,7 @@ class Edit extends \Magento\Backend\Block\Template
* Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
protected function getStoreId()
{
@@ -250,6 +252,7 @@ class Edit extends \Magento\Backend\Block\Template
* Getter for check is this newsletter the plain text.
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsTextType()
{
@@ -260,6 +263,7 @@ class Edit extends \Magento\Backend\Block\Template
* Getter for availability resume action
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCanResume()
{
@@ -270,6 +274,7 @@ class Edit extends \Magento\Backend\Block\Template
* Getter for header text
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
index e59d635501c..511c0b44b4a 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
@@ -56,6 +56,9 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* or from newsletter queue grid by edit option.
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
index 7f85c71a35b..6b9dba21f50 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
@@ -16,6 +16,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* Preparing from for revision page
*
* @return \Magento\Backend\Block\Widget\Form
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index 51c3517b4a5..8f7674d8a1b 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -55,6 +55,7 @@ class Edit extends \Magento\Backend\Block\Widget
* Preparing block layout
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareLayout()
{
@@ -170,6 +171,7 @@ class Edit extends \Magento\Backend\Block\Widget
* Return edit flag for block
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getEditMode()
{
@@ -277,6 +279,7 @@ class Edit extends \Magento\Backend\Block\Widget
* Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
protected function getStoreId()
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
index 7c197160903..58aed9ac957 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
@@ -49,6 +49,8 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* Prepare form before rendering HTML
*
* @return $this
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
index ae0d58e28e6..4d07ad1741a 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
@@ -16,6 +16,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* Preparing from for revision page
*
* @return \Magento\Backend\Block\Widget\Form
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
index 5d6a8d807ba..f6dc01385e4 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
@@ -12,6 +12,7 @@ class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue
*
* @throws \Magento\Framework\Model\Exception
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
index 2da2209ba0f..611bab0c558 100644
--- a/app/code/Magento/Newsletter/Model/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Queue.php
@@ -30,6 +30,7 @@ namespace Magento\Newsletter\Model;
* @method string getQueueFinishAt()
* @method \Magento\Newsletter\Model\Queue setQueueFinishAt(string $value)
* @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Queue extends \Magento\Email\Model\AbstractTemplate
{
@@ -123,6 +124,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
* @param \Magento\Newsletter\Model\Resource\Subscriber\CollectionFactory $subscriberCollectionFactory
* @param \Magento\Newsletter\Model\Queue\TransportBuilder $transportBuilder
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -195,6 +197,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
*
* @param int $count
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function sendPerSubscriber($count = 20)
{
@@ -319,6 +322,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
* Getter for save stores flag.
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getSaveStoresFlag()
{
diff --git a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
index 1da9cb8fd70..ce9c6991f38 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php
@@ -263,6 +263,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* Get queue joined flag
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getQueueJoinedFlag()
{
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index 1a29809a337..26015e724c7 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -135,6 +135,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
index 739269724ee..69dae3c3333 100644
--- a/app/code/Magento/Newsletter/Model/Template.php
+++ b/app/code/Magento/Newsletter/Model/Template.php
@@ -31,6 +31,7 @@ namespace Magento\Newsletter\Model;
* @method \Magento\Newsletter\Model\Template setModifiedAt(string $value)
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Template extends \Magento\Email\Model\AbstractTemplate
{
@@ -100,6 +101,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
* @param \Magento\Newsletter\Model\TemplateFactory $templateFactory
* @param \Magento\Framework\Filter\FilterManager $filterManager
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -216,6 +218,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
* Check Template Text Preprocessed
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getTemplateTextPreprocessed()
{
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
index 559102029f3..0ba82082ea8 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
@@ -56,6 +56,8 @@ class Flatrate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implement
/**
* @param \Magento\Sales\Model\Quote\Address\RateRequest $request
* @return Result|bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function collectRates(\Magento\Sales\Model\Quote\Address\RateRequest $request)
{
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php b/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
index d689bef7b95..e1e94f8cb05 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
@@ -51,6 +51,7 @@ class Pickup extends \Magento\Shipping\Model\Carrier\AbstractCarrier implements
/**
* @param \Magento\Sales\Model\Quote\Address\RateRequest $request
* @return \Magento\Shipping\Model\Rate\Result
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function collectRates(\Magento\Sales\Model\Quote\Address\RateRequest $request)
{
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
index 710c6b45ff3..02d00b7ada9 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -50,6 +50,7 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
* @param \Magento\Sales\Model\Quote\Address\RateResult\MethodFactory $resultMethodFactory
* @param \Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory $tablerateFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -72,6 +73,9 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
/**
* @param \Magento\Sales\Model\Quote\Address\RateRequest $request
* @return \Magento\Shipping\Model\Rate\Result
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function collectRates(\Magento\Sales\Model\Quote\Address\RateRequest $request)
{
diff --git a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
index 254785c9c51..d95a49b43f9 100644
--- a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
@@ -38,6 +38,7 @@ class Freeshipping extends \Magento\Sales\Model\Quote\Address\Total\AbstractTota
*
* @param \Magento\Sales\Model\Quote\Address $address
* @return \Magento\OfflineShipping\Model\Quote\Freeshipping
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function collect(Address $address)
{
diff --git a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
index ee3d001166f..929aeb75e54 100644
--- a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
@@ -13,6 +13,10 @@ namespace Magento\OfflineShipping\Model\Resource\Carrier;
use Magento\Framework\Filesystem;
use Magento\Framework\Filesystem\DirectoryList;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
/**
@@ -240,6 +244,8 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @return \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate
* @todo: this method should be refactored as soon as updated design will be provided
* @see https://wiki.corp.x.com/display/MCOMS/Magento+Filesystem+Decisions
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function uploadAndImport(\Magento\Framework\Object $object)
{
@@ -402,6 +408,8 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param array $row
* @param int $rowNumber
* @return array|false
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getImportRow($row, $rowNumber = 0)
{
diff --git a/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php b/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php
index 148ff16b9ce..d644ce13ba0 100644
--- a/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php
+++ b/app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php
@@ -56,6 +56,7 @@ class BuiltinPlugin
* @param callable $proceed
* @param \Magento\Framework\App\RequestInterface $request
* @return \Magento\Framework\Controller\ResultInterface|\Magento\Framework\App\Response\Http
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundDispatch(
\Magento\Framework\App\FrontControllerInterface $subject,
diff --git a/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php b/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php
index 2a3c8117c52..1a22bdbaba7 100644
--- a/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php
+++ b/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php
@@ -44,6 +44,7 @@ class VarnishPlugin
* @param callable $proceed
* @param \Magento\Framework\App\RequestInterface $request
* @return false|\Magento\Framework\App\Response\Http|\Magento\Framework\Controller\ResultInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundDispatch(
\Magento\Framework\App\FrontControllerInterface $subject,
diff --git a/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php b/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php
index 9f0991bf713..91b7320757a 100644
--- a/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php
+++ b/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php
@@ -56,6 +56,7 @@ class BuiltinPlugin
* @param callable $proceed
* @param ResponseHttp $response
* @return \Magento\Framework\Controller\ResultInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundRenderResult(
\Magento\Framework\Controller\ResultInterface $subject,
diff --git a/app/code/Magento/Payment/Block/Form/Cc.php b/app/code/Magento/Payment/Block/Form/Cc.php
index 2e4dbb9a8e4..5ca0b86f68a 100644
--- a/app/code/Magento/Payment/Block/Form/Cc.php
+++ b/app/code/Magento/Payment/Block/Form/Cc.php
@@ -36,6 +36,7 @@ class Cc extends \Magento\Payment\Block\Form
* Retrieve availables credit card types
*
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getCcAvailableTypes()
{
diff --git a/app/code/Magento/Payment/Block/Info.php b/app/code/Magento/Payment/Block/Info.php
index 9143ae046fd..8e274cd38d2 100644
--- a/app/code/Magento/Payment/Block/Info.php
+++ b/app/code/Magento/Payment/Block/Info.php
@@ -113,6 +113,7 @@ class Info extends \Magento\Framework\View\Element\Template
* false => full information may be shown
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsSecureMode()
{
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 29618544918..8522149c41b 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -17,6 +17,7 @@ use Magento\Payment\Model\MethodInterface;
/**
* Payment module base helper
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
@@ -264,6 +265,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param bool $withGroups
* @param Store|null $store
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getPaymentMethodList($sorted = true, $asLabelValue = false, $withGroups = false, $store = null)
{
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index 7f20e76e347..1261f429355 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -12,6 +12,8 @@ use Magento\Sales\Model\Order\Payment;
/**
* Payment method abstract model
* @method AbstractMethod setStore()
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
abstract class AbstractMethod extends \Magento\Framework\Object implements MethodInterface, PaymentMethodChecksInterface
{
@@ -304,6 +306,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
*
* @param \Magento\Framework\Object $payment
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function canVoid(\Magento\Framework\Object $payment)
{
@@ -357,6 +360,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
* @param \Magento\Payment\Model\Info $payment
* @param string $transactionId
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function fetchTransactionInfo(\Magento\Payment\Model\Info $payment, $transactionId)
{
@@ -506,6 +510,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
*
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function order(\Magento\Framework\Object $payment, $amount)
{
@@ -523,6 +528,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
*
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function authorize(\Magento\Framework\Object $payment, $amount)
{
@@ -540,6 +546,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
*
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function capture(\Magento\Framework\Object $payment, $amount)
{
@@ -587,6 +594,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
* @param float $amount
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function refund(\Magento\Framework\Object $payment, $amount)
{
@@ -614,6 +622,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
* @param \Magento\Framework\Object $payment
*
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function cancel(\Magento\Framework\Object $payment)
{
@@ -640,6 +649,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
*
* @param \Magento\Payment\Model\Info $payment
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function canReviewPayment(\Magento\Payment\Model\Info $payment)
{
@@ -760,6 +770,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
* @param object $stateObject
*
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function initialize($paymentAction, $stateObject)
{
@@ -794,6 +805,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
* Define if debugging is enabled
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDebugFlag()
{
diff --git a/app/code/Magento/Persistent/Helper/Data.php b/app/code/Magento/Persistent/Helper/Data.php
index 47b1a12e53b..4105aeb1515 100644
--- a/app/code/Magento/Persistent/Helper/Data.php
+++ b/app/code/Magento/Persistent/Helper/Data.php
@@ -156,6 +156,7 @@ class Data extends \Magento\Core\Helper\Data
* Check if set `Clear on Logout` in config settings
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getClearOnLogout()
{
@@ -190,6 +191,7 @@ class Data extends \Magento\Core\Helper\Data
*
* @param \Magento\Framework\Event\Observer $observer
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function canProcess($observer)
{
diff --git a/app/code/Magento/Persistent/Model/Observer/ClearExpiredCronJob.php b/app/code/Magento/Persistent/Model/Observer/ClearExpiredCronJob.php
index 2681c966cb4..793d034a884 100644
--- a/app/code/Magento/Persistent/Model/Observer/ClearExpiredCronJob.php
+++ b/app/code/Magento/Persistent/Model/Observer/ClearExpiredCronJob.php
@@ -38,6 +38,7 @@ class ClearExpiredCronJob
*
* @param \Magento\Cron\Model\Schedule $schedule
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function execute(\Magento\Cron\Model\Schedule $schedule)
{
diff --git a/app/code/Magento/Persistent/Model/Observer/CustomerAuthenticatedEvent.php b/app/code/Magento/Persistent/Model/Observer/CustomerAuthenticatedEvent.php
index b650f1aa62e..d7161945f73 100644
--- a/app/code/Magento/Persistent/Model/Observer/CustomerAuthenticatedEvent.php
+++ b/app/code/Magento/Persistent/Model/Observer/CustomerAuthenticatedEvent.php
@@ -46,6 +46,7 @@ class CustomerAuthenticatedEvent
*
* @param \Magento\Framework\Event\Observer $observer
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function execute($observer)
{
diff --git a/app/code/Magento/Persistent/Model/Observer/Session.php b/app/code/Magento/Persistent/Model/Observer/Session.php
index f90e4a7a784..74df0031f82 100644
--- a/app/code/Magento/Persistent/Model/Observer/Session.php
+++ b/app/code/Magento/Persistent/Model/Observer/Session.php
@@ -72,6 +72,7 @@ class Session
/**
* @param Observer $observer
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function synchronizePersistentOnLogin(Observer $observer)
{
diff --git a/app/code/Magento/Persistent/Model/Observer/SetLoadPersistentQuote.php b/app/code/Magento/Persistent/Model/Observer/SetLoadPersistentQuote.php
index 2d98c95e5a8..156934676a9 100644
--- a/app/code/Magento/Persistent/Model/Observer/SetLoadPersistentQuote.php
+++ b/app/code/Magento/Persistent/Model/Observer/SetLoadPersistentQuote.php
@@ -58,6 +58,7 @@ class SetLoadPersistentQuote
*
* @param \Magento\Framework\Event\Observer $observer
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function execute($observer)
{
diff --git a/app/code/Magento/Persistent/Model/Session.php b/app/code/Magento/Persistent/Model/Session.php
index 8015e496df4..ef162816c9a 100644
--- a/app/code/Magento/Persistent/Model/Session.php
+++ b/app/code/Magento/Persistent/Model/Session.php
@@ -109,6 +109,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -162,6 +163,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
* Get if model loads expired sessions
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getLoadExpired()
{
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 98b57693e8c..70ec05d059f 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -8,6 +8,7 @@ namespace Magento\ProductAlert\Model;
* ProductAlert Email processor
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Email extends \Magento\Framework\Model\AbstractModel
{
@@ -118,6 +119,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -280,6 +282,8 @@ class Email extends \Magento\Framework\Model\AbstractModel
* Send customer email
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function send()
{
diff --git a/app/code/Magento/ProductAlert/Model/Observer.php b/app/code/Magento/ProductAlert/Model/Observer.php
index 326d6a005d6..6c3cbac7f97 100644
--- a/app/code/Magento/ProductAlert/Model/Observer.php
+++ b/app/code/Magento/ProductAlert/Model/Observer.php
@@ -8,6 +8,7 @@ namespace Magento\ProductAlert\Model;
* ProductAlert observer
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Observer
{
@@ -123,6 +124,7 @@ class Observer
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\ProductAlert\Model\EmailFactory $emailFactory
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Catalog\Helper\Data $catalogData,
@@ -172,6 +174,8 @@ class Observer
*
* @param \Magento\ProductAlert\Model\Email $email
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _processPrice(\Magento\ProductAlert\Model\Email $email)
{
@@ -257,6 +261,8 @@ class Observer
*
* @param \Magento\ProductAlert\Model\Email $email
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _processStock(\Magento\ProductAlert\Model\Email $email)
{
diff --git a/app/code/Magento/ProductAlert/Model/Resource/AbstractResource.php b/app/code/Magento/ProductAlert/Model/Resource/AbstractResource.php
index 0fafc02a596..d7b1018cd26 100644
--- a/app/code/Magento/ProductAlert/Model/Resource/AbstractResource.php
+++ b/app/code/Magento/ProductAlert/Model/Resource/AbstractResource.php
@@ -62,6 +62,7 @@ abstract class AbstractResource extends \Magento\Framework\Model\Resource\Db\Abs
* @param int $customerId
* @param int $websiteId
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function deleteCustomer(\Magento\Framework\Model\AbstractModel $object, $customerId, $websiteId = null)
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
index 1d2bf67b5f7..9bf05b55549 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
@@ -16,6 +16,7 @@ class YtdStart extends \Magento\Backend\Block\System\Config\Form\Field
/**
* @param AbstractElement $element
* @return string
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getElementHtml(AbstractElement $element)
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
index 502ce81beb7..c70792b3b7d 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
@@ -51,6 +51,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* @param string $fieldId
* @param bool $defaultVisibility
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getFieldVisibility($fieldId, $defaultVisibility = true)
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
index 6cb94496365..b8f61390531 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
@@ -71,6 +71,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
* Apply sorting and filtering to collection
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareCollection()
{
@@ -183,6 +184,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
*
* @param array $data
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _setFilterValues($data)
{
@@ -208,6 +210,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
* Return visibility of store switcher
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getStoreSwitcherVisibility()
{
@@ -240,6 +243,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
* Return visibility of date filter
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDateFilterVisibility()
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
index 78b5540d710..16b58d0c623 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
@@ -185,6 +185,8 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* @return $this|\Magento\Backend\Block\Widget\Grid
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _prepareCollection()
{
@@ -392,6 +394,7 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
* @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection
* @param \Magento\Framework\Object $filterData
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _addCustomFilter($collection, $filterData)
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
index 4795380e045..205ed560504 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Product\Viewed;
* Adminhtml most viewed products report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
index 73e4922c38b..1bebe56a63e 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Sales\Bestsellers;
* Adminhtml bestsellers report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
index 5cdac91fbf3..467e19cc6a5 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Sales\Coupons;
* Adminhtml coupons report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
@@ -40,6 +41,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
/**
* @return \Magento\Backend\Block\Widget\Grid\Extended
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareColumns()
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
index 04167c0dabc..38d3beec3ad 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Sales\Invoiced;
* Adminhtml invoiced report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
index 7c03365493f..13eaebac77f 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Sales\Refunded;
* Adminhtml refunded report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
index b27cfc8492d..e6518ab8daa 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
* Adminhtml sales report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
@@ -38,6 +39,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
/**
* @return \Magento\Backend\Block\Widget\Grid\Extended
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareColumns()
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
index fc3ca2fdf5f..2c36b41b634 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Sales\Shipping;
* Adminhtml shipping report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
index cb96bc5b983..bc26a7aa772 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Sales\Tax;
* Adminhtml tax report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
@@ -152,6 +153,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
* Preparing collection. Filter canceled statuses for orders in taxes
*
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _prepareCollection()
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
index 8d5a10fc9ad..1dd759eabce 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Shopcart\Abandoned;
* Adminhtml abandoned shopping carts report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
{
@@ -85,6 +86,7 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
/**
* @return \Magento\Backend\Block\Widget\Grid\Extended
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareColumns()
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
index db716f31f5c..8cd98a57041 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Shopcart\Customer;
* Adminhtml items in carts report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
index eca3edddcfa..8ad74458a39 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Reports\Block\Adminhtml\Shopcart\Product;
* Adminhtml products in carts report grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
{
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
index de64f4a3fcf..b8bf2a28fbf 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
@@ -10,6 +10,9 @@
*/
namespace Magento\Reports\Controller\Adminhtml\Report;
+/**
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
class Sales extends AbstractReport
{
/**
diff --git a/app/code/Magento/Reports/Helper/Data.php b/app/code/Magento/Reports/Helper/Data.php
index 5ddcd53cf48..dbc868823e0 100644
--- a/app/code/Magento/Reports/Helper/Data.php
+++ b/app/code/Magento/Reports/Helper/Data.php
@@ -41,6 +41,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param string $to
* @param string $period
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getIntervals($from, $to, $period = self::REPORT_PERIOD_TYPE_DAY)
{
diff --git a/app/code/Magento/Reports/Model/Event/Observer.php b/app/code/Magento/Reports/Model/Event/Observer.php
index 29a7c544c17..20d0c87adc0 100644
--- a/app/code/Magento/Reports/Model/Event/Observer.php
+++ b/app/code/Magento/Reports/Model/Event/Observer.php
@@ -106,6 +106,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function customerLogin(\Magento\Framework\Event\Observer $observer)
{
@@ -129,6 +130,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function customerLogout(\Magento\Framework\Event\Observer $observer)
{
@@ -181,6 +183,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function catalogProductCompareRemoveProduct(\Magento\Framework\Event\Observer $observer)
{
@@ -196,6 +199,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function catalogProductCompareClear(\Magento\Framework\Event\Observer $observer)
{
diff --git a/app/code/Magento/Reports/Model/Item.php b/app/code/Magento/Reports/Model/Item.php
index f240cccde06..eb4831e0f83 100644
--- a/app/code/Magento/Reports/Model/Item.php
+++ b/app/code/Magento/Reports/Model/Item.php
@@ -32,6 +32,7 @@ class Item extends \Magento\Framework\Object
* Get is empty indicator
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsEmpty()
{
diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
index c70d3a2ece9..a1798f1f957 100644
--- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
+++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
@@ -58,6 +58,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Reports/Model/Product/Index/Compared.php b/app/code/Magento/Reports/Model/Product/Index/Compared.php
index f79d8be7a0c..03f4c1abdd2 100644
--- a/app/code/Magento/Reports/Model/Product/Index/Compared.php
+++ b/app/code/Magento/Reports/Model/Product/Index/Compared.php
@@ -48,6 +48,7 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php
index 8e54e0fba26..2b83d5ed6a7 100644
--- a/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php
@@ -83,6 +83,7 @@ class AbstractCollection extends \Magento\Framework\Data\Collection
*
* @param int $period
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setDatePeriod($period)
{
@@ -94,6 +95,7 @@ class AbstractCollection extends \Magento\Framework\Data\Collection
*
* @param int $storeId
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setStoreFilter($storeId)
{
diff --git a/app/code/Magento/Reports/Model/Resource/Event.php b/app/code/Magento/Reports/Model/Resource/Event.php
index 62e22c7704c..3c8792ed77c 100644
--- a/app/code/Magento/Reports/Model/Resource/Event.php
+++ b/app/code/Magento/Reports/Model/Resource/Event.php
@@ -54,6 +54,7 @@ class Event extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param int $customerId
* @param array $types
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function updateCustomerType(\Magento\Reports\Model\Event $model, $visitorId, $customerId, $types = [])
{
@@ -168,6 +169,7 @@ class Event extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Reports\Model\Event $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function clean(\Magento\Reports\Model\Event $object)
{
diff --git a/app/code/Magento/Reports/Model/Resource/Order/Collection.php b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
index 5e90b28e091..ce22dd6b495 100644
--- a/app/code/Magento/Reports/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
@@ -10,6 +10,7 @@ use Magento\Framework\DB\Select;
* Reports orders collection
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Collection extends \Magento\Sales\Model\Resource\Order\Collection
{
@@ -105,6 +106,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
*
* @param string $range
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function checkIsLive($range)
{
@@ -361,6 +363,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
* @param string $tzFrom
* @param string $tzTo
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getTZRangeExpressionForAttribute($range, $attribute, $tzFrom = '+00:00', $tzTo = null)
{
@@ -383,6 +386,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
* @param string $customEnd
* @param bool $returnObjects
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getDateRange($range, $customStart, $customEnd, $returnObjects = false)
{
@@ -539,6 +543,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
*
* @param int $isFilter
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _calculateTotalsAggregated($isFilter = 0)
{
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
index 28ad32d28ed..9999f93a21c 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
@@ -10,6 +10,9 @@
*/
namespace Magento\Reports\Model\Resource\Product;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
{
const SELECT_COUNT_SQL_TYPE_CART = 1;
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
index 6a980688534..30f4aef3b87 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
@@ -10,6 +10,9 @@
*/
namespace Magento\Reports\Model\Resource\Product\Index\Collection;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
abstract class AbstractCollection extends \Magento\Catalog\Model\Resource\Product\Collection
{
/**
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
index c6e28286319..7d3fcbf8dfa 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
@@ -10,6 +10,9 @@
*/
namespace Magento\Reports\Model\Resource\Product\Lowstock;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Collection extends \Magento\Reports\Model\Resource\Product\Collection
{
/**
diff --git a/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php b/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php
index 8fea5b72d7d..e52ccfcba2d 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php
@@ -7,6 +7,7 @@ namespace Magento\Reports\Model\Resource\Report;
/**
* Abstract report aggregate resource model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractReport extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
@@ -275,6 +276,7 @@ abstract class AbstractReport extends \Magento\Framework\Model\Resource\Db\Abstr
* @param string $alias
* @param string $relatedAlias
* @return \Magento\Framework\DB\Select
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
protected function _getTableDateRangeRelatedSelect(
$table,
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
index 0065c5b791c..49b2e991485 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
@@ -78,6 +78,7 @@ class Viewed extends \Magento\Sales\Model\Resource\Report\AbstractReport
* @param null|mixed $from
* @param null|mixed $to
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function aggregate($from = null, $to = null)
{
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
index 7923155007e..322f2672dd0 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
@@ -8,6 +8,9 @@
*/
namespace Magento\Reports\Model\Resource\Report\Product\Viewed;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Collection extends \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection
{
/**
@@ -218,6 +221,9 @@ class Collection extends \Magento\Reports\Model\Resource\Report\Collection\Abstr
* totals
*
* @return $this|\Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _beforeLoad()
{
diff --git a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
index 6c3e9d99b3e..1d41208d2f9 100644
--- a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
@@ -28,6 +28,7 @@ class Collection extends \Magento\Review\Model\Resource\Review\Collection
* @param \Magento\Customer\Model\Resource\Customer $customerResource
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
diff --git a/app/code/Magento/Reports/Model/Resource/Shopcart/Product/Collection.php b/app/code/Magento/Reports/Model/Resource/Shopcart/Product/Collection.php
index 65a991c5285..33202f691ed 100644
--- a/app/code/Magento/Reports/Model/Resource/Shopcart/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Shopcart/Product/Collection.php
@@ -31,6 +31,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
* @param string $from
* @param string $to
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setDateRange($from, $to)
{
diff --git a/app/code/Magento/Reports/Model/Totals.php b/app/code/Magento/Reports/Model/Totals.php
index 3e50e6b5be0..d1b6c19e00e 100644
--- a/app/code/Magento/Reports/Model/Totals.php
+++ b/app/code/Magento/Reports/Model/Totals.php
@@ -18,6 +18,8 @@ class Totals
* @param string $from
* @param string $to
* @return \Magento\Framework\Object
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function countTotals($grid, $from, $to)
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
index 829789a368d..1c65f642ba2 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
@@ -50,6 +50,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* Prepare add review form
*
* @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index 60d5e3f094a..a43aed9e8e8 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -54,6 +54,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
* Initialize edit review
*
* @return void
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _construct()
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
index 7d961b20204..3651d0b47d9 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
@@ -67,6 +67,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* Prepare edit review form
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
index 3df4f24b7f9..0e0542f0c13 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -152,6 +152,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
* Prepare grid columns
*
* @return \Magento\Backend\Block\Widget\Grid
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareColumns()
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab/Reviews.php b/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab/Reviews.php
index 2e608f54a95..94fd04c859f 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Edit/Tab/Reviews.php
@@ -6,6 +6,9 @@
*/
namespace Magento\Review\Block\Adminhtml\Product\Edit\Tab;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Reviews extends \Magento\Review\Block\Adminhtml\Grid
{
/**
diff --git a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
index 500357dd747..6389f6d182c 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\Review\Block\Adminhtml\Product;
* Adminhtml product grid block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
index 5393269b9a2..ba53a2324e7 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
@@ -148,6 +148,7 @@ class Detailed extends \Magento\Backend\Block\Template
* @param Option $option
* @param \Magento\Review\Model\Rating $rating
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function isSelected($option, $rating)
{
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 1e1ee3352df..14f151e57f2 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
@@ -60,6 +60,9 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* Prepare rating edit form
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Review/Block/Form.php b/app/code/Magento/Review/Block/Form.php
index 70610780822..3cf00c12c2c 100644
--- a/app/code/Magento/Review/Block/Form.php
+++ b/app/code/Magento/Review/Block/Form.php
@@ -13,6 +13,7 @@ use Magento\Review\Model\Resource\Rating\Collection as RatingCollection;
* Review form block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Form extends \Magento\Framework\View\Element\Template
{
@@ -85,6 +86,7 @@ class Form extends \Magento\Framework\View\Element\Template
* @param \Magento\Framework\App\Http\Context $httpContext
* @param \Magento\Customer\Model\Url $customerUrl
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Review/Block/Product/View.php b/app/code/Magento/Review/Block/Product/View.php
index a2a92b01005..567ceb37336 100644
--- a/app/code/Magento/Review/Block/Product/View.php
+++ b/app/code/Magento/Review/Block/Product/View.php
@@ -11,6 +11,7 @@ use Magento\Review\Model\Resource\Review\Collection as ReviewCollection;
* Product Reviews Page
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class View extends \Magento\Catalog\Block\Product\View
{
@@ -41,6 +42,7 @@ class View extends \Magento\Catalog\Block\Product\View
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Review\Model\Resource\Review\CollectionFactory $collectionFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Catalog\Block\Product\Context $context,
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
index 61f49957729..873ddf65803 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
@@ -9,6 +9,7 @@ class Save extends \Magento\Review\Controller\Adminhtml\Product
{
/**
* @return mixed
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index 1bbc2610ff5..3955e52e9f7 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -13,6 +13,7 @@ use Magento\Review\Model\Review;
* Review controller
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Product extends \Magento\Framework\App\Action\Action
{
@@ -106,6 +107,7 @@ class Product extends \Magento\Framework\App\Action\Action
* @param \Magento\Framework\Session\Generic $reviewSession
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
diff --git a/app/code/Magento/Review/Controller/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php
index 24f6095ac03..22d3c05f828 100644
--- a/app/code/Magento/Review/Controller/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Product/Post.php
@@ -13,6 +13,7 @@ class Post extends \Magento\Review\Controller\Product
* Submit new review action
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Review/Helper/Data.php b/app/code/Magento/Review/Helper/Data.php
index 37508f871d6..4174eccc53d 100644
--- a/app/code/Magento/Review/Helper/Data.php
+++ b/app/code/Magento/Review/Helper/Data.php
@@ -76,6 +76,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* Return an indicator of whether or not guest is allowed to write
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsGuestAllowToWrite()
{
diff --git a/app/code/Magento/Review/Model/Resource/Rating.php b/app/code/Magento/Review/Model/Resource/Rating.php
index 64ba57293a0..a97cb8b6d21 100644
--- a/app/code/Magento/Review/Model/Resource/Rating.php
+++ b/app/code/Magento/Review/Model/Resource/Rating.php
@@ -158,6 +158,7 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\Model\AbstractModel|\Magento\Review\Model\Rating $object
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
{
diff --git a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
index e43f85a0fcf..5a22dd874d2 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
@@ -10,6 +10,7 @@ use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
* Review Product Collection
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
{
@@ -447,6 +448,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param array|null $condition
* @param string $joinType
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
{
diff --git a/app/code/Magento/Review/Model/Review.php b/app/code/Magento/Review/Model/Review.php
index 100b0edb3c8..74a6a157696 100644
--- a/app/code/Magento/Review/Model/Review.php
+++ b/app/code/Magento/Review/Model/Review.php
@@ -18,6 +18,7 @@ use Magento\Review\Model\Resource\Review\Status\Collection as StatusCollection;
* @method \Magento\Review\Model\Review setEntityPkValue(int $value)
* @method int getStatusId()
* @method \Magento\Review\Model\Review setStatusId(int $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Review extends \Magento\Framework\Model\AbstractModel
{
@@ -120,6 +121,7 @@ class Review extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Rule/Model/AbstractModel.php b/app/code/Magento/Rule/Model/AbstractModel.php
index 80aeaa77a24..cff0edf79a2 100644
--- a/app/code/Magento/Rule/Model/AbstractModel.php
+++ b/app/code/Magento/Rule/Model/AbstractModel.php
@@ -99,6 +99,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractModel
*
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function beforeSave()
{
@@ -296,6 +297,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractModel
*
* @param array $data
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _convertFlatToRecursive(array $data)
{
@@ -350,6 +352,8 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractModel
*
* @param \Magento\Framework\Object $object
* @return bool|string[] - return true if validation passed successfully. Array with errors description otherwise
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validateData(\Magento\Framework\Object $object)
{
diff --git a/app/code/Magento/Rule/Model/Action/AbstractAction.php b/app/code/Magento/Rule/Model/Action/AbstractAction.php
index b888e4dee7c..ad0b585ed10 100644
--- a/app/code/Magento/Rule/Model/Action/AbstractAction.php
+++ b/app/code/Magento/Rule/Model/Action/AbstractAction.php
@@ -337,6 +337,7 @@ abstract class AbstractAction extends \Magento\Framework\Object implements Actio
/**
* @param string $format
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function asString($format = '')
{
diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
index 916a1404540..675b1ee40ff 100644
--- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -13,6 +13,10 @@ namespace Magento\Rule\Model\Condition;
use Magento\Framework\Data\Form;
use Magento\Framework\Data\Form\Element\AbstractElement;
+/**
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
abstract class AbstractCondition extends \Magento\Framework\Object implements ConditionInterface
{
/**
@@ -216,6 +220,7 @@ abstract class AbstractCondition extends \Magento\Framework\Object implements Co
/**
* @param array $arr
* @return $this
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function loadArray($arr)
{
@@ -407,6 +412,7 @@ abstract class AbstractCondition extends \Magento\Framework\Object implements Co
/**
* @return array|string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getValueName()
{
@@ -701,6 +707,9 @@ abstract class AbstractCondition extends \Magento\Framework\Object implements Co
*
* @param object|array|int|string|float|bool $validatedValue product attribute value
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function validateAttribute($validatedValue)
{
diff --git a/app/code/Magento/Rule/Model/Condition/Combine.php b/app/code/Magento/Rule/Model/Condition/Combine.php
index 45d78849d03..a1f5d6d55bc 100644
--- a/app/code/Magento/Rule/Model/Condition/Combine.php
+++ b/app/code/Magento/Rule/Model/Condition/Combine.php
@@ -199,6 +199,7 @@ class Combine extends AbstractCondition
* @param array $arr
* @param string $key
* @return $this
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function loadArray($arr, $key = 'conditions')
{
diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index f0d4de7d40f..68b6ef8b59b 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -10,6 +10,10 @@
*/
namespace Magento\Rule\Model\Condition\Product;
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCondition
{
/**
@@ -188,6 +192,7 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
* 'value_option' - hashed array: array($value => $label, ...),
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareValueOptions()
{
@@ -456,6 +461,7 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
* Retrieve Explicit Apply
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getExplicitApply()
{
@@ -482,6 +488,7 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
*
* @param array $arr
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function loadArray($arr)
{
@@ -525,6 +532,8 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
*
* @param \Magento\Framework\Model\AbstractModel $model
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validate(\Magento\Framework\Model\AbstractModel $model)
{
diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
index 0f8f8cecb39..ee2d7c87022 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -140,6 +140,7 @@ class Builder
* @param Combine $combine
* @param string $value
* @return string
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getMappedSqlCombination(Combine $combine, $value = '')
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index e005960ffa7..e71984f2f6c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -8,6 +8,8 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
/**
* Adminhtml sales order address block
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
index 3fb9895a8e7..5c30fca8bcd 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
@@ -10,6 +10,7 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
* Adminhtml sales order create abstract block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractCreate extends \Magento\Backend\Block\Widget
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
index 0a1de984a0f..39b9566ce0a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -8,6 +8,7 @@ namespace Magento\Sales\Block\Adminhtml\Order\Create\Billing;
* Adminhtml sales order create billing address block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
index df37fb306b6..3f8c3f8e40a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
@@ -55,6 +55,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
* @param \Magento\Customer\Model\Address\Mapper $addressMapper
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index 522bbadd388..75c302032f9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -140,6 +140,7 @@ abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\
*
* @param \Magento\Framework\Data\Form\Element\AbstractElement $element
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _addAdditionalFormElementData(\Magento\Framework\Data\Form\Element\AbstractElement $element)
{
@@ -152,6 +153,7 @@ abstract class AbstractForm extends \Magento\Sales\Block\Adminhtml\Order\Create\
* @param \Magento\Customer\Api\Data\AttributeMetadataInterface[] $attributes
* @param \Magento\Framework\Data\Form\AbstractForm $form
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _addAttributesToForm($attributes, \Magento\Framework\Data\Form\AbstractForm $form)
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 38ff541a8c1..79217910d87 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -45,6 +45,7 @@ class Account extends AbstractForm
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index 3d3420432cb..9ae0ed6cc22 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -9,6 +9,7 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
/**
* Order create address form
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
index 44c40e361c7..7ca784342ed 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
@@ -13,6 +13,7 @@ use Magento\Sales\Model\Quote\Item;
/**
* Adminhtml sales order create items grid block
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
@@ -81,6 +82,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
* @param StockRegistryInterface $stockRegistry
* @param StockStateInterface $stockState
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
@@ -446,6 +448,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
* Get flag for rights to move items to customer storage
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getMoveToCustomerStorage()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
index 5135cc9f371..87419e4c8e4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -8,6 +8,7 @@ namespace Magento\Sales\Block\Adminhtml\Order\Create\Shipping;
* Adminhtml sales order create shipping address block
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
{
@@ -62,6 +63,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
* Same as billing address flag
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsAsBilling()
{
@@ -72,6 +74,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
* Saving shipping address must be turned off, when it is the same as billing
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDontSaveInAddressBook()
{
@@ -118,6 +121,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
* Return true is the quote is virtual
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsDisabled()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
index 28187dad830..7ae70dec4da 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
@@ -139,6 +139,7 @@ class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\Abstra
* Retrieve all items
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getItems()
{
@@ -217,6 +218,7 @@ class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\Abstra
*
* @param string|int|null $productType
* @return false
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function isConfigurationRequired($productType)
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
index dedf8478a6d..7b2ce785249 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
@@ -186,6 +186,7 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
* Get note notification
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getNoteNotify()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
index 142451ba00a..f279f4f7c98 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
@@ -10,6 +10,7 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
* Subtotal Total Row Renderer
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
index e092ed249ec..9ecaa1792d1 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
@@ -10,6 +10,7 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
* Subtotal Total Row Renderer
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
index ac7c56845d3..fc26e1dbb60 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
@@ -10,6 +10,7 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
* Subtotal Total Row Renderer
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
index 6872e52489f..05cc201e0b4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
@@ -10,6 +10,7 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
* Subtotal Total Row Renderer
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
index 3dc17dd19db..93fd4866920 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
@@ -8,6 +8,7 @@ namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
* Tax Total Row Renderer
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php
index 196e28d5526..0625b06204f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php
@@ -91,6 +91,7 @@ class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
* Get is submit button disabled or not
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDisableSubmitButton()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
index 60799d03fb7..2db7a175216 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
@@ -53,6 +53,8 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
* Constructor
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _construct()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php
index 920fe13ee01..8a7b99cdc2b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php
@@ -6,6 +6,7 @@ namespace Magento\Sales\Block\Adminhtml\Order\Status\Edit;
/**
* Edit status form
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Form extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus\Form
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
index 919c1cf898e..2980f4045d2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -63,6 +63,9 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
* Constructor
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _construct()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
index 0a1aab9df65..628947f9667 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
@@ -8,6 +8,7 @@ namespace Magento\Sales\Block\Adminhtml\Report\Filter;
* Sales Adminhtml report filter form
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Form extends \Magento\Reports\Block\Adminhtml\Filter\Form
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
index 3283faa517d..8752c911a65 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php
@@ -8,6 +8,7 @@ namespace Magento\Sales\Block\Adminhtml\Report\Filter\Form;
* Sales Adminhtml report filter form for coupons report
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Coupon extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
index 204927be18a..9675c7f5baf 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php
@@ -8,6 +8,7 @@ namespace Magento\Sales\Block\Adminhtml\Report\Filter\Form;
* Sales Adminhtml report filter form order
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Order extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
{
@@ -15,6 +16,7 @@ class Order extends \Magento\Sales\Block\Adminhtml\Report\Filter\Form
* Preparing form
*
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php b/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php
index 248e3806fd6..1a2c47e57f7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/System/Config/Form/Fieldset/Order/Statuses.php
@@ -103,6 +103,7 @@ class Statuses extends \Magento\Backend\Block\System\Config\Form\Fieldset
* @param string $id
* @param string $status
* @return string
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getFieldHtml($fieldset, $id, $status)
{
diff --git a/app/code/Magento/Sales/Block/Items/AbstractItems.php b/app/code/Magento/Sales/Block/Items/AbstractItems.php
index ed4b0b0335f..b80cb099783 100644
--- a/app/code/Magento/Sales/Block/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Block/Items/AbstractItems.php
@@ -8,6 +8,7 @@ namespace Magento\Sales\Block\Items;
* Abstract block for display sales (quote/order/invoice etc.) items
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class AbstractItems extends \Magento\Framework\View\Element\Template
{
@@ -22,6 +23,7 @@ class AbstractItems extends \Magento\Framework\View\Element\Template
* @param string $type
* @return \Magento\Framework\View\Element\AbstractBlock
* @throws \RuntimeException
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getItemRenderer($type)
{
@@ -46,6 +48,7 @@ class AbstractItems extends \Magento\Framework\View\Element\Template
*
* @param \Magento\Framework\View\Element\AbstractBlock $renderer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $renderer)
{
diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
index 9f3d707513d..af07fc6f6c1 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -122,6 +122,7 @@ class DefaultRenderer extends \Magento\Framework\View\Element\Template
* )
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getFormatedOptionValue($optionValue)
{
diff --git a/app/code/Magento/Sales/Block/Order/Totals.php b/app/code/Magento/Sales/Block/Order/Totals.php
index 74fce3fc02d..899d24a3b74 100644
--- a/app/code/Magento/Sales/Block/Order/Totals.php
+++ b/app/code/Magento/Sales/Block/Order/Totals.php
@@ -284,6 +284,7 @@ class Totals extends \Magento\Framework\View\Element\Template
*
* @param array $order
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function applySortOrder($order)
{
diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/State.php b/app/code/Magento/Sales/Block/Status/Grid/Column/State.php
index fa7c2bd773a..753a16943ab 100644
--- a/app/code/Magento/Sales/Block/Status/Grid/Column/State.php
+++ b/app/code/Magento/Sales/Block/Status/Grid/Column/State.php
@@ -44,6 +44,7 @@ class State extends \Magento\Backend\Block\Widget\Grid\Column
* @param \Magento\Backend\Block\Widget\Grid\Column $column
* @param bool $isExport
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function decorateState($value, $row, $column, $isExport)
{
diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
index 9523ca2a159..386838f2b1c 100644
--- a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
+++ b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
@@ -24,6 +24,7 @@ class Unassign extends \Magento\Backend\Block\Widget\Grid\Column
* @param \Magento\Backend\Block\Widget\Grid\Column $column
* @param bool $isExport
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function decorateAction($value, $row, $column, $isExport)
{
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php
index 34520314202..97c8160aa6e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/View.php
@@ -19,6 +19,7 @@ class View extends \Magento\Backend\App\Action
* Creditmemo information page
*
* @return void
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function execute()
{
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order.php b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
index 3950384f3f1..7e671672b05 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
@@ -10,6 +10,7 @@ use Magento\Backend\App\Action;
* Adminhtml sales orders controller
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Order extends \Magento\Backend\App\Action
{
@@ -100,6 +101,7 @@ class Order extends \Magento\Backend\App\Action
* Acl check for admin
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _isAllowed()
{
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index 066511dee95..796afc99863 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -10,6 +10,7 @@ use Magento\Backend\App\Action;
* Adminhtml sales orders creation process controller
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class Create extends \Magento\Backend\App\Action
{
@@ -109,6 +110,9 @@ class Create extends \Magento\Backend\App\Action
*
* @param string $action
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _processActionData($action = null)
{
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
index b6cc613401d..cc3d139ff87 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
@@ -12,6 +12,7 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create
* Saving quote and create order
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
index fd22737d145..85f27c7cadf 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
@@ -49,6 +49,8 @@ class Save extends \Magento\Backend\App\Action
* We can save only new creditmemo. Existing creditmemos are not editable
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
index c02c6e5e2c7..b16226188c2 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
@@ -78,6 +78,7 @@ class CreditmemoLoader extends Object
* @param \Magento\Framework\Registry $registry
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Sales\Model\Order\CreditmemoFactory $creditmemoFactory,
@@ -172,6 +173,7 @@ class CreditmemoLoader extends Object
* Initialize creditmemo model instance
*
* @return \Magento\Sales\Model\Order\Creditmemo|false
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function load()
{
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
index 24eaeae7280..7427292469f 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -94,6 +94,9 @@ class Save extends \Magento\Backend\App\Action
* We can save only new invoice. Existing invoices are not editable
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function execute()
{
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
index 53ab83fb989..0cccb681599 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
@@ -14,6 +14,7 @@ class Pdfdocs extends \Magento\Sales\Controller\Adminhtml\Order
* Print all documents for selected orders
*
* @return ResponseInterface|void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php
index 5c8d4c4a4f4..d9d86803d23 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/View.php
@@ -19,6 +19,7 @@ abstract class View extends \Magento\Backend\App\Action
* Shipment information page
*
* @return void
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function execute()
{
diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
index fd64c11bf68..522111cdbf1 100644
--- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -13,6 +13,8 @@ class DownloadCustomOption extends \Magento\Framework\App\Action\Action
* Custom options download action
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function execute()
{
diff --git a/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php b/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php
index 4e80b486296..e05f19c9a1e 100644
--- a/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php
+++ b/app/code/Magento/Sales/Controller/Order/Plugin/Authentication.php
@@ -37,6 +37,7 @@ class Authentication
* @param \Magento\Framework\App\ActionInterface $subject
* @param RequestInterface $request
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function beforeDispatch(\Magento\Framework\App\ActionInterface $subject, RequestInterface $request)
{
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index fc2383e5fad..6c943563dee 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -9,6 +9,7 @@ use Magento\Framework\App as App;
/**
* Sales module base helper
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Guest extends \Magento\Core\Helper\Data
{
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 5d06152dd0b..68ef0a37779 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -10,6 +10,9 @@ use Magento\Sales\Model\Quote\Item;
/**
* Order create model
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Create extends \Magento\Framework\Object implements \Magento\Checkout\Model\Cart\CartInterface
{
@@ -219,6 +222,7 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
* @param \Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder
* @param \Magento\Customer\Model\Customer\Mapper $customerMapper
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\ObjectManagerInterface $objectManager,
@@ -289,6 +293,7 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
* Return is validate data in import flag
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsValidate()
{
@@ -423,6 +428,8 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
* @param \Magento\Sales\Model\Order $order
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function initFromOrder(\Magento\Sales\Model\Order $order)
{
@@ -704,6 +711,8 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
* @param int $qty
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function moveQuoteItem($item, $moveTo, $qty)
{
@@ -829,6 +838,9 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
* @param array $data
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function applySidebarData($data)
{
@@ -1542,6 +1554,8 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
*
* @param array $data
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function importPostData($data)
{
@@ -1642,6 +1656,7 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
* Set customer data to quote.
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function _prepareCustomer()
{
@@ -1704,6 +1719,7 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
* @param \Magento\Sales\Model\Quote\Address $quoteCustomerAddress
* @return void
* @throws \InvalidArgumentException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareCustomerAddress($customer, $quoteCustomerAddress)
{
@@ -1832,6 +1848,8 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
*
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _validate()
{
diff --git a/app/code/Magento/Sales/Model/Config/Converter.php b/app/code/Magento/Sales/Model/Config/Converter.php
index 508b547132e..de95aae5e20 100644
--- a/app/code/Magento/Sales/Model/Config/Converter.php
+++ b/app/code/Magento/Sales/Model/Config/Converter.php
@@ -16,6 +16,7 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
* @param mixed $source
* @return array
* @throws \InvalidArgumentException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function convert($source)
{
diff --git a/app/code/Magento/Sales/Model/Convert/Order.php b/app/code/Magento/Sales/Model/Convert/Order.php
index 4bb740e237f..c01140469d7 100644
--- a/app/code/Magento/Sales/Model/Convert/Order.php
+++ b/app/code/Magento/Sales/Model/Convert/Order.php
@@ -8,6 +8,9 @@
*/
namespace Magento\Sales\Model\Convert;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Order extends \Magento\Framework\Object
{
/**
diff --git a/app/code/Magento/Sales/Model/Convert/Quote.php b/app/code/Magento/Sales/Model/Convert/Quote.php
index bbcafd4b0ad..fb0dd4bf4f8 100644
--- a/app/code/Magento/Sales/Model/Convert/Quote.php
+++ b/app/code/Magento/Sales/Model/Convert/Quote.php
@@ -7,6 +7,7 @@ namespace Magento\Sales\Model\Convert;
/**
* Quote data convert model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Quote extends \Magento\Framework\Object
{
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 89e8ca8befb..8bf2be5642d 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -175,6 +175,10 @@ use Magento\Sales\Model\Resource\Order\Status\History\Collection as HistoryColle
* @method bool hasForcedCanCreditmemo()
* @method bool getIsInProcess()
* @method \Magento\Customer\Model\Customer getCustomer()
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
{
@@ -411,6 +415,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -529,6 +534,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
* Return flag for order if it can sends new email to customer.
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCanSendNewEmailFlag()
{
@@ -589,6 +595,8 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
* Retrieve order cancel availability
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function canCancel()
{
@@ -648,6 +656,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
* Retrieve order invoice availability
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function canInvoice()
{
@@ -758,6 +767,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
* Retrieve order shipment availability
*
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function canShip()
{
@@ -837,6 +847,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
*
* @param bool $ignoreSalable
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _canReorder($ignoreSalable = false)
{
@@ -1999,6 +2010,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsNotVirtual()
{
diff --git a/app/code/Magento/Sales/Model/Order/Address.php b/app/code/Magento/Sales/Model/Order/Address.php
index f80ebcbba88..6a0f950a75b 100644
--- a/app/code/Magento/Sales/Model/Order/Address.php
+++ b/app/code/Magento/Sales/Model/Order/Address.php
@@ -37,6 +37,7 @@ use Magento\Sales\Api\Data\OrderAddressInterface;
* @method Address setMiddlename(string $value)
* @method Address setSuffix(string $value)
* @method Address setCompany(string $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Address extends AbstractAddress implements OrderAddressInterface
{
@@ -77,6 +78,7 @@ class Address extends AbstractAddress implements OrderAddressInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Sales/Model/Order/Builder.php b/app/code/Magento/Sales/Model/Order/Builder.php
index e55fd4d8546..2c9b197b005 100644
--- a/app/code/Magento/Sales/Model/Order/Builder.php
+++ b/app/code/Magento/Sales/Model/Order/Builder.php
@@ -7,6 +7,9 @@ namespace Magento\Sales\Model\Order;
use Magento\Sales\Model\OrderFactory;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ */
class Builder
{
/**
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index b8ef9173022..7002d8eb093 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -59,6 +59,9 @@ use Magento\Sales\Model\EntityInterface;
* @method \Magento\Sales\Model\Order\Creditmemo setBaseShippingHiddenTaxAmnt(float $value)
* @method \Magento\Sales\Model\Order\Creditmemo setShippingInclTax(float $value)
* @method \Magento\Sales\Model\Order\Creditmemo setBaseShippingInclTax(float $value)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInterface
{
@@ -164,6 +167,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -753,6 +757,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
/**
* @param bool $reload
* @return \Magento\Sales\Model\Resource\Order\Creditmemo\Comment\Collection
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getCommentsCollection($reload = false)
{
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
index 1aa934f6a25..6b55dc531e7 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
@@ -42,6 +42,7 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/AbstractTotal.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/AbstractTotal.php
index 65268ee7bb3..3d979262d9d 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/AbstractTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/AbstractTotal.php
@@ -16,6 +16,7 @@ abstract class AbstractTotal extends \Magento\Sales\Model\Order\Total\AbstractTo
*
* @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
{
diff --git a/app/code/Magento/Sales/Model/Order/Customer.php b/app/code/Magento/Sales/Model/Order/Customer.php
index 98ac4ac55f5..59ab8afdf86 100644
--- a/app/code/Magento/Sales/Model/Order/Customer.php
+++ b/app/code/Magento/Sales/Model/Order/Customer.php
@@ -92,6 +92,7 @@ class Customer
* @param string $customerPrefix
* @param string $customerSuffix
* @param string $customerTaxvat
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
$customerDob,
diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
index 602fbe33aef..702974c1f1f 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
@@ -51,6 +51,9 @@ use Magento\Sales\Model\EntityInterface;
* @method \Magento\Sales\Model\Order\Invoice setBaseShippingHiddenTaxAmnt(float $value)
* @method \Magento\Sales\Model\Order\Invoice setShippingInclTax(float $value)
* @method \Magento\Sales\Model\Order\Invoice setBaseShippingInclTax(float $value)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
{
@@ -165,6 +168,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -616,6 +620,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
*
* @return $this
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function register()
{
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
index 45eec7d8064..a3160cffc40 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
@@ -42,6 +42,7 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/AbstractTotal.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/AbstractTotal.php
index bfeabbc4b83..895cf21d12e 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/AbstractTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/AbstractTotal.php
@@ -16,6 +16,7 @@ abstract class AbstractTotal extends \Magento\Sales\Model\Order\Total\AbstractTo
*
* @param \Magento\Sales\Model\Order\Invoice $invoice
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
{
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
index c71bdbf4edf..982f6bf0205 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
@@ -11,6 +11,7 @@ class Tax extends AbstractTotal
*
* @param \Magento\Sales\Model\Order\Invoice $invoice
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
{
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index dd313aff3ea..67631c93bee 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -94,6 +94,9 @@ use Magento\Sales\Api\Data\OrderItemInterface;
* @method \Magento\Sales\Model\Order\Item setBaseTaxRefunded(float $value)
* @method \Magento\Sales\Model\Order\Item setDiscountRefunded(float $value)
* @method \Magento\Sales\Model\Order\Item setBaseDiscountRefunded(float $value)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Item extends AbstractExtensibleModel implements OrderItemInterface
{
@@ -186,6 +189,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -376,6 +380,8 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
* Retrieve item status identifier
*
* @return int
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getStatusId()
{
@@ -630,6 +636,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
* Check if discount has to be applied to parent item
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getForceApplyDiscountToParentItem()
{
@@ -673,6 +680,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
*
* @param bool $shipment
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function isDummy($shipment = false)
{
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index d4ed96c547c..43f6ef48533 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -66,6 +66,9 @@ use Magento\Sales\Api\Data\OrderPaymentInterface;
* @method \Magento\Sales\Model\Order\Payment setCcNumberEnc(string $value)
* @method \Magento\Sales\Model\Order\Payment setCcTransId(string $value)
* @method \Magento\Sales\Model\Order\Payment setAddressStatus(string $value)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Payment extends Info implements OrderPaymentInterface
{
@@ -158,6 +161,7 @@ class Payment extends Info implements OrderPaymentInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -278,6 +282,7 @@ class Payment extends Info implements OrderPaymentInterface
* This method is supposed to be called only when order is placed
*
* @return $this
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function place()
{
@@ -695,6 +700,8 @@ class Payment extends Info implements OrderPaymentInterface
* @return $this
* @throws \Exception
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function refund($creditmemo)
{
@@ -790,6 +797,7 @@ class Payment extends Info implements OrderPaymentInterface
*
* @param float $amount
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function registerRefundNotification($amount)
{
@@ -978,6 +986,8 @@ class Payment extends Info implements OrderPaymentInterface
* @param bool $isOnline
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function registerPaymentReviewAction($action, $isOnline)
{
@@ -1209,6 +1219,8 @@ class Payment extends Info implements OrderPaymentInterface
* @param float $amount
* @param string $gatewayCallback
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _void($isOnline, $amount = null, $gatewayCallback = 'void')
{
@@ -1283,6 +1295,8 @@ class Payment extends Info implements OrderPaymentInterface
* @param \Magento\Sales\Model\AbstractModel $salesDocument
* @param bool $failsafe
* @return null|\Magento\Sales\Model\Order\Payment\Transaction
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _addTransaction($type, $salesDocument = null, $failsafe = false)
{
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index 69b6619a720..9114cf39237 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -22,6 +22,8 @@ use Magento\Sales\Api\Data\TransactionInterface;
* @method \Magento\Sales\Model\Order\Payment\Transaction setCreatedAt(string $value)
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Transaction extends AbstractExtensibleModel implements TransactionInterface
{
@@ -160,6 +162,7 @@ class Transaction extends AbstractExtensibleModel implements TransactionInterfac
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -299,6 +302,8 @@ class Transaction extends AbstractExtensibleModel implements TransactionInterfac
* @param string $txnId
* @param bool $recursive
* @return Transaction[]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getChildTransactions($types = null, $txnId = null, $recursive = false)
{
@@ -567,6 +572,7 @@ class Transaction extends AbstractExtensibleModel implements TransactionInterfac
* @return $this
* @throws \Magento\Framework\Model\Exception
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function close($shouldSave = true)
{
@@ -726,6 +732,8 @@ class Transaction extends AbstractExtensibleModel implements TransactionInterfac
*
* @return void
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _loadChildren()
{
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index 22bd3b898d6..e053da1df33 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -8,6 +8,8 @@ use Magento\Framework\App\Filesystem\DirectoryList;
/**
* Sales Order PDF abstract model
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractPdf extends \Magento\Framework\Object
{
@@ -218,6 +220,7 @@ abstract class AbstractPdf extends \Magento\Framework\Object
* @param \Zend_Pdf_Page &$page
* @param null $store
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function insertLogo(&$page, $store = null)
{
@@ -329,6 +332,7 @@ abstract class AbstractPdf extends \Magento\Framework\Object
*
* @param array $address
* @return int Height
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _calcAddressHeight($address)
{
@@ -354,6 +358,9 @@ abstract class AbstractPdf extends \Magento\Framework\Object
* @param \Magento\Sales\Model\Order $obj
* @param bool $putOrderId
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function insertOrder(&$page, $obj, $putOrderId = true)
{
@@ -929,6 +936,9 @@ abstract class AbstractPdf extends \Magento\Framework\Object
* @param array $pageSettings
* @throws \Magento\Framework\Model\Exception
* @return \Zend_Pdf_Page
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function drawLineBlocks(\Zend_Pdf_Page $page, array $draw, array $pageSettings = [])
{
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
index b163fd2bf8d..5fba85dd8cc 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
@@ -6,6 +6,7 @@ namespace Magento\Sales\Model\Order\Pdf;
/**
* Sales Order Creditmemo PDF model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Creditmemo extends AbstractPdf
{
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
index 5d7d121479b..140e72fefdd 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
@@ -6,6 +6,7 @@ namespace Magento\Sales\Model\Order\Pdf;
/**
* Sales Order Invoice PDF model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Invoice extends AbstractPdf
{
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
index 4be5f572e09..485f546299e 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
@@ -8,6 +8,7 @@ use Magento\Framework\App\Filesystem\DirectoryList;
/**
* Sales Order Pdf Items renderer Abstract
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractItems extends \Magento\Framework\Model\AbstractModel
{
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
index a46d46bf3df..e1760165d88 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
@@ -6,6 +6,7 @@ namespace Magento\Sales\Model\Order\Pdf;
/**
* Sales Order Shipment PDF model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Shipment extends AbstractPdf
{
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
index 7db973093c2..6676f2cce6b 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
@@ -88,6 +88,7 @@ class DefaultTotal extends \Magento\Framework\Object
* )
*
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getFullTaxInfo()
{
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index 32d4a78faf2..fdfaa79075e 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -26,6 +26,7 @@ use Magento\Sales\Model\EntityInterface;
* @method \Magento\Sales\Model\Order\Shipment setIncrementId(string $value)
* @method \Magento\Sales\Model\Order\Shipment setCreatedAt(string $value)
* @method \Magento\Sales\Model\Order\Shipment setUpdatedAt(string $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Shipment extends AbstractModel implements EntityInterface, ShipmentInterface
{
@@ -112,6 +113,7 @@ class Shipment extends AbstractModel implements EntityInterface, ShipmentInterfa
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
index 15ea5cc47c2..986639559e4 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
@@ -42,6 +42,7 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
index 699824bb0d3..b0411cc1c13 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Track.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
@@ -67,6 +67,7 @@ class Track extends AbstractModel implements ShipmentTrackInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Sales/Model/Order/Status/History.php b/app/code/Magento/Sales/Model/Order/Status/History.php
index 0312b69baf2..eba332daa20 100644
--- a/app/code/Magento/Sales/Model/Order/Status/History.php
+++ b/app/code/Magento/Sales/Model/Order/Status/History.php
@@ -56,6 +56,7 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Sales/Model/Quote.php b/app/code/Magento/Sales/Model/Quote.php
index 2a3013319bd..7d88bdcc0e4 100644
--- a/app/code/Magento/Sales/Model/Quote.php
+++ b/app/code/Magento/Sales/Model/Quote.php
@@ -115,6 +115,10 @@ use Magento\Sales\Model\Quote\Address;
* @method Quote setIsPersistent(bool $value)
* @method Quote setSharedStoreIds(array $values)
* @method Quote setWebsite($value)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Quote extends \Magento\Framework\Model\AbstractModel
{
@@ -356,6 +360,7 @@ class Quote extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -1054,6 +1059,7 @@ class Quote extends \Magento\Framework\Model\AbstractModel
*
* @param bool $useCache
* @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getItemsCollection($useCache = true)
{
@@ -1276,6 +1282,8 @@ class Quote extends \Magento\Framework\Model\AbstractModel
* @param null|string $processMode
* @return \Magento\Sales\Model\Quote\Item|string
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addProduct(
\Magento\Catalog\Model\Product $product,
@@ -1363,6 +1371,7 @@ class Quote extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Catalog\Model\Product $product
* @param int $qty
* @return \Magento\Sales\Model\Quote\Item
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _addCatalogProduct(\Magento\Catalog\Model\Product $product, $qty = 1)
{
@@ -1417,6 +1426,7 @@ class Quote extends \Magento\Framework\Model\AbstractModel
* @throws \Magento\Framework\Model\Exception
*
* @see \Magento\Catalog\Helper\Product::addParamsToBuyRequest()
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function updateItem($itemId, $buyRequest, $params = null)
{
@@ -1593,6 +1603,7 @@ class Quote extends \Magento\Framework\Model\AbstractModel
/**
* @param string $paymentId
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getPaymentById($paymentId)
{
@@ -1925,6 +1936,7 @@ class Quote extends \Magento\Framework\Model\AbstractModel
* @param string $type An internal error type ('error', 'qty', etc.), passed then to adding messages routine
* @param array $params
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function removeErrorInfosByParams($type, $params)
{
@@ -2015,6 +2027,8 @@ class Quote extends \Magento\Framework\Model\AbstractModel
/**
* @param bool $multishipping
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validateMinimumAmount($multishipping = false)
{
@@ -2106,6 +2120,7 @@ class Quote extends \Magento\Framework\Model\AbstractModel
* Check quote for virtual product only
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsVirtual()
{
diff --git a/app/code/Magento/Sales/Model/Quote/Address.php b/app/code/Magento/Sales/Model/Quote/Address.php
index a362afd5ea1..25eab112fdb 100644
--- a/app/code/Magento/Sales/Model/Quote/Address.php
+++ b/app/code/Magento/Sales/Model/Quote/Address.php
@@ -111,6 +111,10 @@ use Magento\Framework\Api\AttributeDataBuilder;
* @method \Magento\SalesRule\Model\Rule[] getCartFixedRules()
* @method int[] getAppliedRuleIds()
* @method Address setBaseShippingInclTax(float $value)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Address extends \Magento\Customer\Model\Address\AbstractAddress
{
@@ -269,6 +273,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -567,6 +572,8 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
* Get all available address items
*
* @return \Magento\Sales\Model\Quote\Address\Item[]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getAllItems()
{
@@ -1026,6 +1033,8 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
*
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function requestShippingRates(\Magento\Sales\Model\Quote\Item\AbstractItem $item = null)
{
@@ -1253,6 +1262,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
* @param float $value
* @param bool $alreadyExclTax
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setShippingAmount($value, $alreadyExclTax = false)
{
@@ -1265,6 +1275,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
* @param float $value
* @param bool $alreadyExclTax
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setBaseShippingAmount($value, $alreadyExclTax = false)
{
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php b/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
index c17e6a94303..f757b8544c0 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
@@ -6,6 +6,7 @@ namespace Magento\Sales\Model\Quote\Address\Total;
/**
* Sales Quote Address Total abstract model
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractTotal
{
@@ -230,6 +231,7 @@ abstract class AbstractTotal
*
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsItemRowTotalCompoundable(\Magento\Sales\Model\Quote\Item\AbstractItem $item)
{
@@ -246,6 +248,7 @@ abstract class AbstractTotal
* @param array $config
* @param store $store
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function processConfigArray($config, $store)
{
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php b/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php
index 9c711850919..95a40c1bea9 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php
@@ -137,6 +137,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
* Initialize retrievers array
*
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
*/
private function _initRetrievers()
{
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/Discount.php b/app/code/Magento/Sales/Model/Quote/Address/Total/Discount.php
index b0344cd6c77..686eb5f9efc 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/Discount.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/Discount.php
@@ -33,6 +33,7 @@ class Discount extends \Magento\Sales\Model\Quote\Address\Total\AbstractTotal
/**
* @param \Magento\Sales\Model\Quote\Address $address
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function collect(\Magento\Sales\Model\Quote\Address $address)
{
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Sales/Model/Quote/Address/Total/Shipping.php
index 7ab5938b64b..16d41cbdb78 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/Shipping.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/Shipping.php
@@ -28,6 +28,9 @@ class Shipping extends \Magento\Sales\Model\Quote\Address\Total\AbstractTotal
*
* @param \Magento\Sales\Model\Quote\Address $address
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function collect(\Magento\Sales\Model\Quote\Address $address)
{
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/Tax.php b/app/code/Magento/Sales/Model/Quote/Address/Total/Tax.php
index 2262d64a717..06057f8a47f 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/Tax.php
@@ -59,6 +59,9 @@ class Tax extends \Magento\Sales\Model\Quote\Address\Total\AbstractTotal
/**
* @param \Magento\Sales\Model\Quote\Address $address
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function collect(\Magento\Sales\Model\Quote\Address $address)
{
diff --git a/app/code/Magento/Sales/Model/Quote/Item.php b/app/code/Magento/Sales/Model/Quote/Item.php
index 445859a2ea9..6c22d70b3b7 100644
--- a/app/code/Magento/Sales/Model/Quote/Item.php
+++ b/app/code/Magento/Sales/Model/Quote/Item.php
@@ -96,6 +96,7 @@ namespace Magento\Sales\Model\Quote;
* @method null|bool getHasConfigurationUnavailableError()
* @method \Magento\Sales\Model\Quote\Item setHasConfigurationUnavailableError(bool $value)
* @method \Magento\Sales\Model\Quote\Item unsHasConfigurationUnavailableError()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Item extends \Magento\Sales\Model\Quote\Item\AbstractItem
{
diff --git a/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
index 796cbcda8ab..5c53c317ebb 100644
--- a/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
+++ b/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
@@ -41,6 +41,7 @@ use Magento\Sales\Model\Quote\Item;
* @method float getDiscountTaxCompensation()
* @method float getRowTotal()
* @method float getPriceInclTax()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractItem extends \Magento\Framework\Model\AbstractModel implements
\Magento\Catalog\Model\Product\Configuration\Item\ItemInterface
diff --git a/app/code/Magento/Sales/Model/Quote/Item/Updater.php b/app/code/Magento/Sales/Model/Quote/Item/Updater.php
index ee5c771aa54..de60231ef9a 100644
--- a/app/code/Magento/Sales/Model/Quote/Item/Updater.php
+++ b/app/code/Magento/Sales/Model/Quote/Item/Updater.php
@@ -54,6 +54,7 @@ class Updater
* @param array $info
* @throws InvalidArgumentException
* @return Updater
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function update(Item $item, array $info)
{
diff --git a/app/code/Magento/Sales/Model/Quote/Payment.php b/app/code/Magento/Sales/Model/Quote/Payment.php
index 57c2ad97e9c..b72731e717c 100644
--- a/app/code/Magento/Sales/Model/Quote/Payment.php
+++ b/app/code/Magento/Sales/Model/Quote/Payment.php
@@ -77,6 +77,7 @@ class Payment extends \Magento\Payment\Model\Info
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Sales/Model/QuoteRepository/Plugin/Authorization.php b/app/code/Magento/Sales/Model/QuoteRepository/Plugin/Authorization.php
index 9c45c72110c..9213020f192 100644
--- a/app/code/Magento/Sales/Model/QuoteRepository/Plugin/Authorization.php
+++ b/app/code/Magento/Sales/Model/QuoteRepository/Plugin/Authorization.php
@@ -31,6 +31,7 @@ class Authorization
* @param \Magento\Sales\Model\Quote $quote
* @return \Magento\Sales\Model\Quote
* @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterGetActive(
\Magento\Sales\Model\QuoteRepository $subject,
@@ -49,6 +50,7 @@ class Authorization
* @param \Magento\Sales\Model\Quote $quote
* @return \Magento\Sales\Model\Quote
* @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterGetActiveForCustomer(
\Magento\Sales\Model\QuoteRepository $subject,
diff --git a/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
index aceafd15169..a67c9ab96ed 100644
--- a/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
@@ -162,6 +162,7 @@ abstract class AbstractCollection extends \Magento\Framework\Model\Resource\Db\C
* @return $this
*
* @todo implement join functionality if necessary
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinType = 'inner', $storeId = null)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Entity.php b/app/code/Magento/Sales/Model/Resource/Entity.php
index 9331aff68ad..4d3169b510f 100644
--- a/app/code/Magento/Sales/Model/Resource/Entity.php
+++ b/app/code/Magento/Sales/Model/Resource/Entity.php
@@ -9,6 +9,7 @@ use Magento\Sales\Model\EntityInterface;
/**
* Flat sales resource abstract
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class Entity extends AbstractDb
{
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Grid/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Grid/Collection.php
index 4a3510491ba..4b5cda3e941 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Grid/Collection.php
@@ -85,6 +85,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
* Get customer mode flag value
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsCustomerMode()
{
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Handler/State.php b/app/code/Magento/Sales/Model/Resource/Order/Handler/State.php
index f07182ad71f..18af86baf22 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Handler/State.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Handler/State.php
@@ -17,6 +17,8 @@ class State
*
* @param Order $order
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function check(Order $order)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Plugin/Authorization.php b/app/code/Magento/Sales/Model/Resource/Order/Plugin/Authorization.php
index 25c18db0b6e..6d46afa6f5d 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Plugin/Authorization.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Plugin/Authorization.php
@@ -34,6 +34,7 @@ class Authorization
* @param null|string $field
* @return \Magento\Sales\Model\Order
* @throws NoSuchEntityException
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundLoad(
\Magento\Sales\Model\Resource\Order $subject,
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Status.php b/app/code/Magento/Sales/Model/Resource/Order/Status.php
index df6258b3683..53dd2771743 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Status.php
@@ -265,6 +265,7 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param string $state
* @return string
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function getStatusByState($state)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Quote/Address/Attribute/Backend.php b/app/code/Magento/Sales/Model/Resource/Quote/Address/Attribute/Backend.php
index a24dbbdbaa1..8abb8ada5cb 100644
--- a/app/code/Magento/Sales/Model/Resource/Quote/Address/Attribute/Backend.php
+++ b/app/code/Magento/Sales/Model/Resource/Quote/Address/Attribute/Backend.php
@@ -16,6 +16,7 @@ class Backend extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBacken
*
* @param \Magento\Sales\Model\Quote\Address $address
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function collectTotals(\Magento\Sales\Model\Quote\Address $address)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php b/app/code/Magento/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php
index 4d39f012265..30ea33b29d1 100644
--- a/app/code/Magento/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php
+++ b/app/code/Magento/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php
@@ -16,6 +16,7 @@ class Frontend extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFron
*
* @param \Magento\Sales\Model\Quote\Address $address
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function fetchTotals(\Magento\Sales\Model\Quote\Address $address)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Quote/Item/Collection.php b/app/code/Magento/Sales/Model/Resource/Quote/Item/Collection.php
index 979e2932865..63ce8da3b3b 100644
--- a/app/code/Magento/Sales/Model/Resource/Quote/Item/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Quote/Item/Collection.php
@@ -182,6 +182,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* Add products to items and item options
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _assignProducts()
{
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
index 49989878dc4..e112d782d1b 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
@@ -6,6 +6,7 @@ namespace Magento\Sales\Model\Resource\Report;
/**
* Bestsellers report resource model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Bestsellers extends AbstractReport
{
@@ -79,6 +80,7 @@ class Bestsellers extends AbstractReport
* @param string|int|\Zend_Date|array|null $to
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function aggregate($from = null, $to = null)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
index 16782bc6898..4d1c4c36ef1 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
@@ -216,6 +216,9 @@ class Collection extends \Magento\Sales\Model\Resource\Report\Collection\Abstrac
* but before adding unions and calculating totals
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _beforeLoad()
{
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php b/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
index ca3f986adca..09c1bba13da 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
@@ -49,6 +49,7 @@ class Invoiced extends AbstractReport
* @param string|null $to
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _aggregateByInvoiceCreatedAt($from, $to)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php
index 598ea134ea2..44f8095efcf 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php
@@ -41,6 +41,8 @@ class Createdat extends \Magento\Sales\Model\Resource\Report\AbstractReport
* @param string|int|\Zend_Date|array|null $to
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _aggregateByField($aggregationField, $from, $to)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Refunded.php b/app/code/Magento/Sales/Model/Resource/Report/Refunded.php
index 91111be7c66..a49c05338b5 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Refunded.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Refunded.php
@@ -136,6 +136,7 @@ class Refunded extends AbstractReport
* @param string|null $to
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _aggregateByRefundCreatedAt($from, $to)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Shipping.php b/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
index 21306eea592..2c897376dea 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
@@ -140,6 +140,7 @@ class Shipping extends AbstractReport
* @param string|null $to
* @return $this
* @throws \Exception
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _aggregateByShippingCreatedAt($from, $to)
{
diff --git a/app/code/Magento/Sales/Model/Resource/Setup.php b/app/code/Magento/Sales/Model/Resource/Setup.php
index eb17dbec66e..230887fea8d 100644
--- a/app/code/Magento/Sales/Model/Resource/Setup.php
+++ b/app/code/Magento/Sales/Model/Resource/Setup.php
@@ -164,6 +164,8 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
* @param string $code
* @param array $data
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getAttributeColumnDefinition($code, $data)
{
diff --git a/app/code/Magento/Sales/Model/Service/Order.php b/app/code/Magento/Sales/Model/Service/Order.php
index 4c6f5d7111b..c15e5da968d 100644
--- a/app/code/Magento/Sales/Model/Service/Order.php
+++ b/app/code/Magento/Sales/Model/Service/Order.php
@@ -204,6 +204,8 @@ class Order
* @param object $invoice
* @param array $data
* @return \Magento\Sales\Model\Order\Creditmemo
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function prepareInvoiceCreditmemo($invoice, $data = [])
{
@@ -315,6 +317,7 @@ class Order
* @param \Magento\Sales\Model\Order\Item $item
* @param array $qtys
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _canInvoiceItem($item, $qtys = [])
{
@@ -355,6 +358,7 @@ class Order
* @param \Magento\Sales\Model\Order\Item $item
* @param array $qtys
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _canShipItem($item, $qtys = [])
{
@@ -401,6 +405,7 @@ class Order
* @param array $qtys
* @param array $invoiceQtysRefundLimits
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _canRefundItem($item, $qtys = [], $invoiceQtysRefundLimits = [])
{
diff --git a/app/code/Magento/Sales/Model/Service/Quote.php b/app/code/Magento/Sales/Model/Service/Quote.php
index f2872f9cdf2..8bdd1404a58 100644
--- a/app/code/Magento/Sales/Model/Service/Quote.php
+++ b/app/code/Magento/Sales/Model/Service/Quote.php
@@ -7,6 +7,7 @@ namespace Magento\Sales\Model\Service;
/**
* Class Quote
* Quote submit service model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Quote
{
@@ -110,6 +111,7 @@ class Quote
* @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param \Magento\Customer\Api\Data\RegionDataBuilder $regionDataBuilder
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
@@ -209,6 +211,8 @@ class Quote
*
* @return \Magento\Sales\Model\Order
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function submitOrderWithDataObject()
{
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php
index ea32f81cdc4..7846f269c49 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php
@@ -84,6 +84,7 @@ class Actions extends \Magento\Backend\Block\Widget\Form\Generic implements
* Prepare form before rendering HTML
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php
index 1f64df08565..4fcc2e5f545 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php
@@ -40,6 +40,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* Prepare coupon codes generation parameters form
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
index bfd7b0ce873..7f911a3ef4a 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
@@ -115,6 +115,8 @@ class Main extends Generic implements TabInterface
* Prepare form before rendering HTML
*
* @return $this
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
index 66f405391d4..95547dade3c 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php
@@ -11,6 +11,7 @@ class Edit extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
* Promo quote edit action
*
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
index 1aa9ed6cc53..8131e0bc0fa 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
@@ -11,6 +11,8 @@ class Save extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
* Promo quote save action
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/SalesRule/Model/Observer.php b/app/code/Magento/SalesRule/Model/Observer.php
index 11507f162de..4f0ca2c3ab3 100644
--- a/app/code/Magento/SalesRule/Model/Observer.php
+++ b/app/code/Magento/SalesRule/Model/Observer.php
@@ -6,6 +6,9 @@ namespace Magento\SalesRule\Model;
use Magento\Framework\Event\Observer as EventObserver;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Observer
{
/**
@@ -89,6 +92,7 @@ class Observer
/**
* @param EventObserver $observer
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function salesOrderAfterPlace($observer)
{
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
index ac2b485eb9e..6e4ba24a839 100644
--- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -58,6 +58,7 @@ class Discount extends \Magento\Sales\Model\Quote\Address\Total\AbstractTotal
*
* @param Address $address
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function collect(Address $address)
{
diff --git a/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php b/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
index 63bd5a0554e..38f92fde3a8 100644
--- a/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
+++ b/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
@@ -41,6 +41,7 @@ class Createdat extends \Magento\Reports\Model\Resource\Report\AbstractReport
* @param mixed $from
* @param mixed $to
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _aggregateByOrder($aggregationField, $from, $to)
{
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
index e0cc5a38af2..45a7fbeecc6 100644
--- a/app/code/Magento/SalesRule/Model/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Rule.php
@@ -62,6 +62,7 @@ use Magento\Sales\Model\Quote\Address;
* @method \Magento\SalesRule\Model\Rule setCouponCode(string $value)
* @method int getRuleId()
* @method \Magento\SalesRule\Model\Rule setRuleId(int $ruleId)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Rule extends \Magento\Rule\Model\AbstractModel
{
@@ -184,6 +185,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -435,6 +437,8 @@ class Rule extends \Magento\Rule\Model\AbstractModel
* @param int $saveAttemptCount Number of attempts to save newly created coupon
* @return \Magento\SalesRule\Model\Coupon|null
* @throws \Exception|\Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
{
@@ -524,6 +528,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
*
* @param Address $address
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsValidForAddress($address)
{
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php
index bea0defa401..5f125f1f307 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Found.php
@@ -54,6 +54,7 @@ class Found extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
*
* @param \Magento\Framework\Model\AbstractModel $model
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function validate(\Magento\Framework\Model\AbstractModel $model)
{
diff --git a/app/code/Magento/SalesRule/Model/RulesApplier.php b/app/code/Magento/SalesRule/Model/RulesApplier.php
index 4dace1d8f8d..33be5c89edc 100644
--- a/app/code/Magento/SalesRule/Model/RulesApplier.php
+++ b/app/code/Magento/SalesRule/Model/RulesApplier.php
@@ -47,6 +47,7 @@ class RulesApplier
* @param bool $skipValidation
* @param mixed $couponCode
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function applyRules($item, $rules, $skipValidation, $couponCode)
{
diff --git a/app/code/Magento/SalesRule/Model/Utility.php b/app/code/Magento/SalesRule/Model/Utility.php
index 43f9fa2c1f7..2f1990049c9 100644
--- a/app/code/Magento/SalesRule/Model/Utility.php
+++ b/app/code/Magento/SalesRule/Model/Utility.php
@@ -76,6 +76,8 @@ class Utility
* @param \Magento\SalesRule\Model\Rule $rule
* @param \Magento\Sales\Model\Quote\Address $address
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function canProcessRule($rule, $address)
{
@@ -179,6 +181,7 @@ class Utility
* @param \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function deltaRoundingFix(
\Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData,
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index b934c473ad7..4dc6fcd0ba1 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -18,6 +18,7 @@ use Magento\Sales\Model\Quote\Item\AbstractItem;
* @method Validator setWebsiteId($id)
* @method mixed getCustomerGroupId()
* @method Validator setCustomerGroupId($id)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Validator extends \Magento\Framework\Model\AbstractModel
{
@@ -100,6 +101,7 @@ class Validator extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -245,6 +247,7 @@ class Validator extends \Magento\Framework\Model\AbstractModel
*
* @param Address $address
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function processShippingAmount(Address $address)
{
diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
index 747e285bef7..a715b212ede 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
@@ -6,6 +6,7 @@ namespace Magento\Search\Block\Adminhtml\Dashboard;
/**
* Dashboard last search keywords block
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Last extends \Magento\Backend\Block\Dashboard\Grid
{
diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
index bfc541cb336..30cba87a47b 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
@@ -6,6 +6,7 @@ namespace Magento\Search\Block\Adminhtml\Dashboard;
/**
* Dashboard last search keywords block
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Top extends \Magento\Backend\Block\Dashboard\Grid
{
diff --git a/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
index 19a39a35d87..12ed47f6931 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
@@ -50,6 +50,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* Prepare form fields
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
index 1334049f026..ff55e2b3467 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
@@ -32,6 +32,7 @@ class Edit extends \Magento\Search\Controller\Adminhtml\Term
/**
* @return \Magento\Backend\Model\View\Result\Page
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
index f483caa72d3..45b1cef503e 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
@@ -30,6 +30,7 @@ class Save extends \Magento\Search\Controller\Adminhtml\Term
* Save search query
*
* @return \Magento\Backend\Model\View\Result\Redirect
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php
index e9f4092c9fd..d2d29b90ef3 100644
--- a/app/code/Magento/Search/Helper/Data.php
+++ b/app/code/Magento/Search/Helper/Data.php
@@ -250,6 +250,7 @@ class Data extends AbstractHelper
*
* @param mixed $store
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function checkNotes($store = null)
{
diff --git a/app/code/Magento/Search/Model/Query.php b/app/code/Magento/Search/Model/Query.php
index aa0fe6755bd..b7f4c4a019d 100644
--- a/app/code/Magento/Search/Model/Query.php
+++ b/app/code/Magento/Search/Model/Query.php
@@ -39,6 +39,7 @@ use Magento\Store\Model\StoreManagerInterface;
* @method string getUpdatedAt()
* @method \Magento\Search\Model\Query setUpdatedAt(string $value)
* @method \Magento\Search\Model\Query setIsQueryTextExceeded(bool $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Query extends AbstractModel implements QueryInterface
{
diff --git a/app/code/Magento/Search/Model/Resource/Helper.php b/app/code/Magento/Search/Model/Resource/Helper.php
index b6e779f1d7b..2d5a28bd99c 100644
--- a/app/code/Magento/Search/Model/Resource/Helper.php
+++ b/app/code/Magento/Search/Model/Resource/Helper.php
@@ -24,6 +24,7 @@ class Helper extends \Magento\Framework\DB\Helper
* @param string $str The source string
* @param int $maxWordLength
* @return array (0 => words, 1 => terms)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function prepareTerms($str, $maxWordLength = 0)
{
diff --git a/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php b/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php
index 22b59f311f8..4cffba0bbcb 100644
--- a/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php
@@ -36,6 +36,7 @@ class Sendmail extends \Magento\Sendfriend\Controller\Product
* Send Email Post Action
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Sendfriend/Model/Observer.php b/app/code/Magento/Sendfriend/Model/Observer.php
index b5d32062f1e..9a498a734e8 100644
--- a/app/code/Magento/Sendfriend/Model/Observer.php
+++ b/app/code/Magento/Sendfriend/Model/Observer.php
@@ -30,6 +30,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function register(\Magento\Framework\Event\Observer $observer)
{
diff --git a/app/code/Magento/Sendfriend/Model/Resource/Sendfriend.php b/app/code/Magento/Sendfriend/Model/Resource/Sendfriend.php
index 6fd232b0120..6f1bd3c3427 100644
--- a/app/code/Magento/Sendfriend/Model/Resource/Sendfriend.php
+++ b/app/code/Magento/Sendfriend/Model/Resource/Sendfriend.php
@@ -29,6 +29,7 @@ class Sendfriend extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param int $startTime
* @param int $websiteId
* @return int
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getSendCount($object, $ip, $startTime, $websiteId = null)
{
diff --git a/app/code/Magento/Sendfriend/Model/Sendfriend.php b/app/code/Magento/Sendfriend/Model/Sendfriend.php
index 5f928d51c62..116578d8050 100644
--- a/app/code/Magento/Sendfriend/Model/Sendfriend.php
+++ b/app/code/Magento/Sendfriend/Model/Sendfriend.php
@@ -17,6 +17,7 @@ use Magento\Framework\Model\Exception as CoreException;
* @method \Magento\Sendfriend\Model\Sendfriend setTime(int $value)
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Sendfriend extends \Magento\Framework\Model\AbstractModel
{
@@ -120,6 +121,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -218,6 +220,8 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
* Validate Form data
*
* @return bool|string[]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function validate()
{
@@ -267,6 +271,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
*
* @param array $recipients
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function setRecipients($recipients)
{
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php b/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
index b3955a4ea74..8e51c87fd2f 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
@@ -69,6 +69,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
* Get create label button html
*
* @return string
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getCreateLabelButton()
{
diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
index 58ef0e9a32f..670b6e7f7cf 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Popup.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Popup.php
@@ -85,6 +85,7 @@ class Popup extends \Magento\Framework\View\Element\Template
* Is 'contact us' option enabled?
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getContactUsEnabled()
{
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php
index 950585e1b2c..dbe6d848608 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php
@@ -49,6 +49,7 @@ class MassPrintShippingLabel extends \Magento\Backend\App\Action
* Push pdf document with shipping labels to user browser
*
* @return ResponseInterface|void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 893cf57a363..a192c298db1 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -77,6 +77,8 @@ class Save extends \Magento\Backend\App\Action
* We can save only new shipment. Existing shipments are not editable
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index 21a384ed884..b1f367ae006 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -132,6 +132,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @param string $field
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getConfigFlag($field)
{
@@ -195,6 +196,8 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @param \Magento\Framework\Object|null $params
* @return array|bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _getAllowedContainers(\Magento\Framework\Object $params = null)
{
@@ -267,6 +270,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
/**
* @param \Magento\Sales\Model\Quote\Address\RateRequest $request
* @return $this|bool|false|\Magento\Framework\Model\AbstractModel
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function checkAvailableShipCountries(\Magento\Sales\Model\Quote\Address\RateRequest $request)
{
@@ -373,6 +377,8 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
/**
* @param \Magento\Sales\Model\Quote\Address\RateRequest $request
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _updateFreeMethodQuote($request)
{
@@ -576,6 +582,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
* Define if debugging is enabled
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDebugFlag()
{
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 3a8f97aab63..250f8557cfd 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -11,6 +11,7 @@ use Magento\Shipping\Model\Shipment\Request;
/**
* Abstract online shipping carrier model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractCarrierOnline extends AbstractCarrier
{
@@ -246,6 +247,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
*
* @param RateRequest $request
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getAllItems(RateRequest $request)
{
@@ -278,6 +280,8 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
*
* @param RateRequest $request
* @return $this|bool|Error
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function proccessAdditionalValidation(RateRequest $request)
{
@@ -517,6 +521,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
* @return bool
*
* @todo implement rollback logic
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function rollBack($data)
{
@@ -565,6 +570,7 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
*
* @param null|string $countyDest
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function isGirthAllowed($countyDest = null)
{
diff --git a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
index fd099bac014..4396bbd5667 100644
--- a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
+++ b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
@@ -6,6 +6,9 @@ namespace Magento\Shipping\Model\Order\Pdf;
use Magento\Shipping\Helper\Carrier;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
{
/**
@@ -141,6 +144,10 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
*
* @param \Zend_Pdf_Page $page
* @return \Magento\Shipping\Model\Order\Pdf\Packaging
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _drawPackageBlock(\Zend_Pdf_Page $page)
{
diff --git a/app/code/Magento/Shipping/Model/Rate/Result.php b/app/code/Magento/Shipping/Model/Rate/Result.php
index cbbacd061cf..2c647b0fdba 100644
--- a/app/code/Magento/Shipping/Model/Rate/Result.php
+++ b/app/code/Magento/Shipping/Model/Rate/Result.php
@@ -181,6 +181,7 @@ class Result
* Sort rates by price from min to max
*
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function sortRatesByPrice()
{
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index e80576a030d..779c0badaef 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -7,6 +7,9 @@ namespace Magento\Shipping\Model;
use Magento\Sales\Model\Order\Shipment;
use Magento\Sales\Model\Quote\Address\RateCollectorInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Shipping implements RateCollectorInterface
{
/**
@@ -230,6 +233,8 @@ class Shipping implements RateCollectorInterface
* @param string $carrierCode
* @param \Magento\Sales\Model\Quote\Address\RateRequest $request
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function collectCarrierRates($carrierCode, $request)
{
@@ -309,6 +314,8 @@ class Shipping implements RateCollectorInterface
* @param \Magento\Shipping\Model\Carrier\AbstractCarrier $carrier
* @param \Magento\Sales\Model\Quote\Address\RateRequest $request
* @return array [int, float]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function composePackagesForCarrier($carrier, $request)
{
diff --git a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
index 43b358eacda..f843e45eb1c 100644
--- a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
+++ b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
@@ -8,6 +8,9 @@ namespace Magento\Shipping\Model\Shipping;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\App\RequestInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class LabelGenerator
{
/**
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index 506e437cf3a..4ea4dccda13 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -8,6 +8,7 @@ use Magento\Sales\Model\Order\Shipment;
/**
* Shipping labels model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Labels extends \Magento\Shipping\Model\Shipping
{
@@ -33,6 +34,7 @@ class Labels extends \Magento\Shipping\Model\Shipping
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
* @param \Magento\Backend\Model\Auth\Session $authSession
* @param \Magento\Shipping\Model\Shipment\Request $request
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -68,6 +70,8 @@ class Labels extends \Magento\Shipping\Model\Shipping
* @param Shipment $orderShipment
* @return \Magento\Framework\Object
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function requestToShipment(Shipment $orderShipment)
{
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
index 2a5eccdd008..8ffc475ea2a 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
@@ -28,6 +28,7 @@ class Edit extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
* Edit sitemap
*
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
index 62d24a3f7c8..87a6a61e9a2 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
@@ -14,6 +14,7 @@ class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
* Save action
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index ef351bdf2b9..4ec6f97dfd3 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -89,6 +89,8 @@ class Observer
*
* @param \Magento\Cron\Model\Schedule $schedule
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function scheduledGenerateSitemaps($schedule)
{
diff --git a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
index 2bd5f593acd..4743cbb6ded 100644
--- a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
@@ -10,6 +10,7 @@ use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
* Sitemap resource product collection model
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Product extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 948fd619223..be8003120f4 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -21,6 +21,8 @@ use Magento\Framework\App\Filesystem\DirectoryList;
* @method \Magento\Sitemap\Model\Sitemap setSitemapTime(string $value)
* @method int getStoreId()
* @method \Magento\Sitemap\Model\Sitemap setStoreId(int $value)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Sitemap extends \Magento\Framework\Model\AbstractModel
{
@@ -156,6 +158,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php
index 54c7b490e15..cc18909e624 100644
--- a/app/code/Magento/Store/App/Action/Plugin/Context.php
+++ b/app/code/Magento/Store/App/Action/Plugin/Context.php
@@ -53,6 +53,7 @@ class Context
* @param callable $proceed
* @param \Magento\Framework\App\RequestInterface $request
* @return mixed
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundDispatch(
\Magento\Framework\App\Action\Action $subject,
diff --git a/app/code/Magento/Store/Model/Resource/Group/Collection.php b/app/code/Magento/Store/Model/Resource/Group/Collection.php
index 29a63470202..04020c4ed0c 100644
--- a/app/code/Magento/Store/Model/Resource/Group/Collection.php
+++ b/app/code/Magento/Store/Model/Resource/Group/Collection.php
@@ -35,6 +35,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* Is load default (admin) store
*
* @return boolean
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getLoadDefault()
{
diff --git a/app/code/Magento/Store/Model/Resource/Store/Collection.php b/app/code/Magento/Store/Model/Resource/Store/Collection.php
index 175a313c577..131174d4948 100644
--- a/app/code/Magento/Store/Model/Resource/Store/Collection.php
+++ b/app/code/Magento/Store/Model/Resource/Store/Collection.php
@@ -50,6 +50,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* Is load default (admin) store
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getLoadDefault()
{
diff --git a/app/code/Magento/Store/Model/Resource/Website/Collection.php b/app/code/Magento/Store/Model/Resource/Website/Collection.php
index ee2b60ad296..582e922a5f9 100644
--- a/app/code/Magento/Store/Model/Resource/Website/Collection.php
+++ b/app/code/Magento/Store/Model/Resource/Website/Collection.php
@@ -56,6 +56,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* Is load default (admin) website
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getLoadDefault()
{
diff --git a/app/code/Magento/Store/Model/Storage/Db.php b/app/code/Magento/Store/Model/Storage/Db.php
index 94f6e8c8ae1..feaeb575483 100644
--- a/app/code/Magento/Store/Model/Storage/Db.php
+++ b/app/code/Magento/Store/Model/Storage/Db.php
@@ -13,6 +13,10 @@ use Magento\Store\Model\StoreFactory;
use Magento\Store\Model\Website;
use Magento\Store\Model\WebsiteFactory as WebsiteFactory;
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Db implements \Magento\Store\Model\StoreManagerInterface
{
/**
@@ -132,6 +136,7 @@ class Db implements \Magento\Store\Model\StoreManagerInterface
* @param State $appState
* @param bool $isSingleStoreAllowed
* @param null $currentStore
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
StoreFactory $storeFactory,
@@ -178,6 +183,7 @@ class Db implements \Magento\Store\Model\StoreManagerInterface
* Init store, group and website collections
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _initStores()
{
@@ -282,6 +288,8 @@ class Db implements \Magento\Store\Model\StoreManagerInterface
* @param null|string|bool|int|Store $storeId
* @return Store
* @throws \Magento\Framework\App\InitException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getStore($storeId = null)
{
diff --git a/app/code/Magento/Store/Model/StorageFactory.php b/app/code/Magento/Store/Model/StorageFactory.php
index edcf2110824..e03db84cdb8 100644
--- a/app/code/Magento/Store/Model/StorageFactory.php
+++ b/app/code/Magento/Store/Model/StorageFactory.php
@@ -6,6 +6,9 @@ namespace Magento\Store\Model;
use Magento\Framework\Profiler;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class StorageFactory
{
/**
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index 2d51a5f1618..55ef04b7929 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -18,6 +18,9 @@ use Magento\Framework\Model\AbstractModel;
* @method int getStoreId()
* @method \Magento\Store\Model\Store setSortOrder(int $value)
* @method \Magento\Store\Model\Store setIsActive(int $value)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Store extends AbstractModel implements
\Magento\Framework\App\ScopeInterface,
@@ -316,6 +319,7 @@ class Store extends AbstractModel implements
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param bool $isCustomEntryPoint
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -525,6 +529,8 @@ class Store extends AbstractModel implements
* @param boolean|null $secure
* @return string
* @throws \InvalidArgumentException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getBaseUrl($type = \Magento\Framework\UrlInterface::URL_TYPE_LINK, $secure = null)
{
@@ -1010,6 +1016,8 @@ class Store extends AbstractModel implements
*
* @param bool|string $fromStore
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getCurrentUrl($fromStore = true)
{
diff --git a/app/code/Magento/Store/Model/System/Store.php b/app/code/Magento/Store/Model/System/Store.php
index c3cde144be7..29be887532c 100644
--- a/app/code/Magento/Store/Model/System/Store.php
+++ b/app/code/Magento/Store/Model/System/Store.php
@@ -99,6 +99,8 @@ class Store extends \Magento\Framework\Object
* @param bool $empty
* @param bool $all
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getStoreValuesForForm($empty = false, $all = false)
{
@@ -155,6 +157,8 @@ class Store extends \Magento\Framework\Object
* @param array $groupIds
* @param array $websiteIds
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getStoresStructure($isAll = false, $storeIds = [], $groupIds = [], $websiteIds = [])
{
diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
index a9622277f55..51a13faed28 100644
--- a/app/code/Magento/Store/Model/Website.php
+++ b/app/code/Magento/Store/Model/Website.php
@@ -25,6 +25,8 @@ use Magento\Store\Model\StoreManagerInterface;
* @method \Magento\Store\Model\Website setDefaultGroupId(int $value)
* @method int getIsDefault()
* @method \Magento\Store\Model\Website setIsDefault(int $value)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Website extends \Magento\Framework\Model\AbstractModel implements
\Magento\Framework\Object\IdentityInterface,
@@ -174,6 +176,7 @@ class Website extends \Magento\Framework\Model\AbstractModel implements
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Tax/Api/Data/QuoteDetailsItemInterface.php b/app/code/Magento/Tax/Api/Data/QuoteDetailsItemInterface.php
index bfbdacc6dc0..f6d188130f3 100644
--- a/app/code/Magento/Tax/Api/Data/QuoteDetailsItemInterface.php
+++ b/app/code/Magento/Tax/Api/Data/QuoteDetailsItemInterface.php
@@ -71,6 +71,7 @@ interface QuoteDetailsItemInterface extends \Magento\Framework\Api\ExtensibleDat
* Get indicate that if the tax is included in the unit price and row total
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getTaxIncluded();
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 6230cd5f044..1b772520e42 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -13,6 +13,9 @@ namespace Magento\Tax\Block\Adminhtml\Rate;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Tax\Controller\RegistryConstants;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
const FORM_ELEMENT_ID = 'rate-form';
@@ -70,6 +73,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* @param \Magento\Tax\Api\TaxRateRepositoryInterface $taxRateRepository
* @param \Magento\Tax\Model\TaxRateCollection $taxRateCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
@@ -103,6 +107,9 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php
index 87b1b5c2607..e26d3fca84f 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php
@@ -89,6 +89,9 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Tax/Block/Checkout/Cart/Sidebar/Totals.php b/app/code/Magento/Tax/Block/Checkout/Cart/Sidebar/Totals.php
index 3035168ed7d..e0cbdcaf591 100644
--- a/app/code/Magento/Tax/Block/Checkout/Cart/Sidebar/Totals.php
+++ b/app/code/Magento/Tax/Block/Checkout/Cart/Sidebar/Totals.php
@@ -85,6 +85,7 @@ class Totals extends SidebarTotals
* Return whether subtotal should be displayed including tax
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDisplaySubtotalInclTax()
{
@@ -95,6 +96,7 @@ class Totals extends SidebarTotals
* Return whether subtotal should be displayed excluding tax
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDisplaySubtotalExclTax()
{
@@ -105,6 +107,7 @@ class Totals extends SidebarTotals
* Return whether subtotal should be displayed excluding and including tax
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getDisplaySubtotalBoth()
{
diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
index b7addd8d333..bda3ace8a14 100644
--- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php
+++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
@@ -114,6 +114,7 @@ class Tax extends \Magento\Framework\View\Element\Template
/**
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _initSubtotal()
{
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule.php
index 8f5759e45e0..491b496bc2e 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule.php
@@ -80,6 +80,7 @@ class Rule extends \Magento\Backend\App\Action
*
* @param array $postData
* @return \Magento\Tax\Api\Data\TaxRuleInterface
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function populateTaxRule($postData)
{
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 26e3386435f..c1f82df0eae 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -21,6 +21,8 @@ use Magento\Sales\Model\EntityInterface;
/**
* Catalog data helper
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
@@ -169,6 +171,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Catalog\Helper\Data $catalogHelper
* @param OrderTaxManagementInterface $orderTaxManagement
* @param PriceCurrencyInterface $priceCurrency
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
@@ -789,6 +792,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param EntityInterface $order
* @param EntityInterface $salesItem
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function calculateTaxForItems(EntityInterface $order, EntityInterface $salesItem)
{
diff --git a/app/code/Magento/Tax/Model/Calculation.php b/app/code/Magento/Tax/Model/Calculation.php
index 5c7cfdc5523..8b2086fd556 100644
--- a/app/code/Magento/Tax/Model/Calculation.php
+++ b/app/code/Magento/Tax/Model/Calculation.php
@@ -19,6 +19,8 @@ use Magento\Tax\Model\Config;
/**
* Tax Calculation Model
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Calculation extends \Magento\Framework\Model\AbstractModel
{
@@ -186,6 +188,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
* @param PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -469,6 +472,9 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
* @param null|int|\Magento\Store\Model\Store $store
* @param int $customerId
* @return \Magento\Framework\Object
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getRateRequest(
$shippingAddress = null,
diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
index d871fde75ba..d8f9a4872ea 100644
--- a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
@@ -13,6 +13,9 @@ use Magento\Tax\Api\Data\TaxDetailsItemInterface;
use Magento\Tax\Api\TaxClassManagementInterface;
use Magento\Tax\Model\Calculation;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
abstract class AbstractCalculator
{
/**#@+
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate.php b/app/code/Magento/Tax/Model/Calculation/Rate.php
index 31a852062eb..69f0dba1804 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate.php
@@ -22,6 +22,7 @@ use Magento\Framework\Exception\CouldNotDeleteException;
* @method \Magento\Tax\Model\Calculation\Rate setZipIsRange(int $value)
* @method \Magento\Tax\Model\Calculation\Rate setZipFrom(int $value)
* @method \Magento\Tax\Model\Calculation\Rate setZipTo(int $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements \Magento\Tax\Api\Data\TaxRateInterface
{
@@ -62,6 +63,7 @@ class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements \
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -104,6 +106,8 @@ class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements \
*
* @return \Magento\Tax\Model\Calculation\Rate
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function beforeSave()
{
diff --git a/app/code/Magento/Tax/Model/Calculation/RateRepository.php b/app/code/Magento/Tax/Model/Calculation/RateRepository.php
index 299cc227c61..2361d5197db 100644
--- a/app/code/Magento/Tax/Model/Calculation/RateRepository.php
+++ b/app/code/Magento/Tax/Model/Calculation/RateRepository.php
@@ -17,6 +17,9 @@ use Magento\Tax\Api\Data\TaxRateInterface as TaxRateDataObject;
use Magento\Tax\Model\Calculation\Rate\Converter;
use Magento\Tax\Model\Resource\Calculation\Rate\Collection;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class RateRepository implements \Magento\Tax\Api\TaxRateRepositoryInterface
{
const MESSAGE_TAX_RATE_ID_IS_NOT_ALLOWED = 'id is not expected for this request.';
diff --git a/app/code/Magento/Tax/Model/Calculation/Rule.php b/app/code/Magento/Tax/Model/Calculation/Rule.php
index 18aece57d59..3fe525b09b8 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rule.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rule.php
@@ -58,6 +58,7 @@ class Rule extends \Magento\Framework\Model\AbstractExtensibleModel implements T
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php b/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
index a4a379ba38d..78e07010349 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
@@ -32,6 +32,9 @@ class Validator extends \Magento\Framework\Validator\AbstractValidator
* @param \Magento\Tax\Model\Calculation\Rule $value
* @return boolean
* @throws Zend_Validate_Exception If validation of $value is impossible
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function isValid($value)
{
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index bfd8e11e649..6f8d0f1707d 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -12,6 +12,9 @@ namespace Magento\Tax\Model;
use Magento\Store\Model\Store;
+/**
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ */
class Config
{
// tax notifications
@@ -262,6 +265,7 @@ class Config
* Get flag what we need use shipping price exclude tax
*
* @return bool $flag
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getNeedUseShippingExcludeTax()
{
@@ -783,6 +787,7 @@ class Config
*
* @param null|string|bool|int|Store $store
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getInfoUrl($store = null)
{
@@ -799,6 +804,7 @@ class Config
*
* @param null|int|string|Store $store
* @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function needPriceConversion($store = null)
{
diff --git a/app/code/Magento/Tax/Model/Observer.php b/app/code/Magento/Tax/Model/Observer.php
index da2ad2ba127..ec9589dff5c 100644
--- a/app/code/Magento/Tax/Model/Observer.php
+++ b/app/code/Magento/Tax/Model/Observer.php
@@ -116,6 +116,9 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function salesEventOrderAfterSave(\Magento\Framework\Event\Observer $observer)
{
@@ -253,6 +256,7 @@ class Observer
*
* @param \Magento\Cron\Model\Schedule $schedule
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aggregateSalesReportTaxData($schedule)
{
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation.php b/app/code/Magento/Tax/Model/Resource/Calculation.php
index b885c1c90ed..15582f75cb9 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation.php
@@ -129,6 +129,8 @@ class Calculation extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Framework\Object $request
* @param array|null $rates
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getCalculationProcess($request, $rates = null)
{
@@ -262,6 +264,9 @@ class Calculation extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\Object $request
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _getRates($request)
{
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index 604fbf63405..f575b6bb03c 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -19,6 +19,7 @@ use Magento\Tax\Api\Data\TaxDetailsItemInterface;
/**
* Tax totals calculation model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class CommonTaxCollector extends AbstractTotal
{
@@ -708,6 +709,8 @@ class CommonTaxCollector extends AbstractTotal
* @param float $baseAmount
* @param float $rate
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _saveAppliedTaxes(
QuoteAddress $address,
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index aa786ec33bf..92b39c7f726 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -12,6 +12,7 @@ use Magento\Tax\Model\Calculation;
/**
* Tax totals calculation model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Tax extends CommonTaxCollector
{
@@ -229,6 +230,7 @@ class Tax extends CommonTaxCollector
* @param Address $address
* @param array $itemsByType
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function processExtraTaxables(Address $address, Array $itemsByType)
{
@@ -280,6 +282,7 @@ class Tax extends CommonTaxCollector
*
* @param Address $address
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function fetch(Address $address)
{
diff --git a/app/code/Magento/Tax/Model/TaxCalculation.php b/app/code/Magento/Tax/Model/TaxCalculation.php
index 97b31af401c..97eb86e8958 100644
--- a/app/code/Magento/Tax/Model/TaxCalculation.php
+++ b/app/code/Magento/Tax/Model/TaxCalculation.php
@@ -19,6 +19,9 @@ use Magento\Tax\Model\Calculation\AbstractCalculator;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Tax\Api\TaxCalculationInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class TaxCalculation implements TaxCalculationInterface
{
/**
diff --git a/app/code/Magento/Tax/Model/TaxClass/Repository.php b/app/code/Magento/Tax/Model/TaxClass/Repository.php
index 0d2bfda3cad..2746f1e2ca0 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Repository.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Repository.php
@@ -20,6 +20,9 @@ use Magento\Tax\Model\ClassModelRegistry;
use Magento\Tax\Model\Resource\TaxClass\Collection as TaxClassCollection;
use Magento\Tax\Model\Resource\TaxClass\CollectionFactory as TaxClassCollectionFactory;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Repository implements \Magento\Tax\Api\TaxClassRepositoryInterface
{
/**
diff --git a/app/code/Magento/Tax/Model/TaxRuleRepository.php b/app/code/Magento/Tax/Model/TaxRuleRepository.php
index 6dd5ae33995..0d2b8cc6e9b 100644
--- a/app/code/Magento/Tax/Model/TaxRuleRepository.php
+++ b/app/code/Magento/Tax/Model/TaxRuleRepository.php
@@ -21,6 +21,9 @@ use Magento\Tax\Model\Resource\Calculation\Rule as Resource;
use Magento\Tax\Model\Resource\Calculation\Rule\Collection;
use Magento\Tax\Model\Resource\Calculation\Rule\CollectionFactory;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class TaxRuleRepository implements TaxRuleRepositoryInterface
{
/**
diff --git a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
index d60d86a2283..f14ab9a98e7 100644
--- a/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
+++ b/app/code/Magento/TaxImportExport/Model/Rate/CsvImportHandler.php
@@ -141,6 +141,7 @@ class CsvImportHandler
* @param array $validFields assoc array of valid file fields
* @return array
* @throws \Magento\Framework\Model\Exception
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _filterRateData(array $rateRawData, array $invalidFields, array $validFields)
{
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
index 211e6ad7e4e..8e628bb0b6c 100644
--- a/app/code/Magento/Translation/Model/Inline/Parser.php
+++ b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -271,6 +271,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
* @param array $matches
* @param array $options
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getAttributeLocation($matches, $options)
{
@@ -284,6 +285,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
* @param array $matches
* @param array $options
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getTagLocation($matches, $options)
{
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index e5ab456ae6e..db333e01f16 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -11,6 +11,7 @@ class DataProvider implements DataProviderInterface
* Get translation data
*
* @return string[]
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getData()
{
diff --git a/app/code/Magento/Ui/Component/AbstractView.php b/app/code/Magento/Ui/Component/AbstractView.php
index 1fd832be29b..fd1b316abd0 100644
--- a/app/code/Magento/Ui/Component/AbstractView.php
+++ b/app/code/Magento/Ui/Component/AbstractView.php
@@ -18,6 +18,8 @@ use Magento\Ui\DataProvider\Manager;
/**
* Abstract class AbstractView
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractView extends Template implements UiComponentInterface
{
diff --git a/app/code/Magento/Ui/Component/Filter/Type/Date.php b/app/code/Magento/Ui/Component/Filter/Type/Date.php
index e476d9f7542..d07b84c53bf 100644
--- a/app/code/Magento/Ui/Component/Filter/Type/Date.php
+++ b/app/code/Magento/Ui/Component/Filter/Type/Date.php
@@ -18,6 +18,7 @@ use Magento\Ui\DataProvider\Manager;
/**
* Class Date
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Date extends FilterAbstract
{
@@ -55,6 +56,7 @@ class Date extends FilterAbstract
* @param FilterPool $filterPool
* @param ResolverInterface $localeResolver
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
TemplateContext $context,
diff --git a/app/code/Magento/Ui/Component/Form.php b/app/code/Magento/Ui/Component/Form.php
index e765e240a86..956bc06a045 100644
--- a/app/code/Magento/Ui/Component/Form.php
+++ b/app/code/Magento/Ui/Component/Form.php
@@ -73,6 +73,7 @@ class Form extends AbstractView
* @param ActionPool $actionPool
* @param ButtonProviderFactory $buttonProviderFactory
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
TemplateContext $context,
@@ -209,6 +210,7 @@ class Form extends AbstractView
* @param array $itemA
* @param array $itemB
* @return int
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function sortButtons(array $itemA, array $itemB)
{
diff --git a/app/code/Magento/Ui/Component/Form/Element/AbstractFormElement.php b/app/code/Magento/Ui/Component/Form/Element/AbstractFormElement.php
index 7f8b1299e58..8cd29324972 100644
--- a/app/code/Magento/Ui/Component/Form/Element/AbstractFormElement.php
+++ b/app/code/Magento/Ui/Component/Form/Element/AbstractFormElement.php
@@ -37,6 +37,7 @@ abstract class AbstractFormElement extends AbstractView implements ElementInterf
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsReadonly()
{
diff --git a/app/code/Magento/Ui/Component/Form/Element/ElementInterface.php b/app/code/Magento/Ui/Component/Form/Element/ElementInterface.php
index 0e6c7e964df..6703903adcd 100644
--- a/app/code/Magento/Ui/Component/Form/Element/ElementInterface.php
+++ b/app/code/Magento/Ui/Component/Form/Element/ElementInterface.php
@@ -23,6 +23,7 @@ interface ElementInterface extends UiComponentInterface
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsReadonly();
diff --git a/app/code/Magento/Ui/Component/Form/Element/Radio.php b/app/code/Magento/Ui/Component/Form/Element/Radio.php
index 6c5e7ae5561..fe8c51dfebc 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Radio.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Radio.php
@@ -11,6 +11,7 @@ class Radio extends AbstractFormElement
{
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getChecked()
{
diff --git a/app/code/Magento/Ui/Component/Form/Element/Select.php b/app/code/Magento/Ui/Component/Form/Element/Select.php
index cefc727600c..2458dda0330 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Select.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Select.php
@@ -14,6 +14,7 @@ class Select extends AbstractFormElement
*
* @param string $optionValue
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsSelected($optionValue)
{
diff --git a/app/code/Magento/Ui/Component/Form/Fieldset.php b/app/code/Magento/Ui/Component/Form/Fieldset.php
index 6bc1641b5b6..96f3846535f 100644
--- a/app/code/Magento/Ui/Component/Form/Fieldset.php
+++ b/app/code/Magento/Ui/Component/Form/Fieldset.php
@@ -28,6 +28,7 @@ class Fieldset extends AbstractView
/**
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getIsCollapsible()
{
diff --git a/app/code/Magento/Ui/Component/Layout/AbstractStructure.php b/app/code/Magento/Ui/Component/Layout/AbstractStructure.php
index fed10e44951..be4d9ba4f35 100644
--- a/app/code/Magento/Ui/Component/Layout/AbstractStructure.php
+++ b/app/code/Magento/Ui/Component/Layout/AbstractStructure.php
@@ -88,6 +88,7 @@ class AbstractStructure extends AbstractView
/**
* @inheritdoc
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function prepare()
{
@@ -203,6 +204,7 @@ class AbstractStructure extends AbstractView
/**
* @param array $dataSourceConfig
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function processDataSource(array $dataSourceConfig)
{
@@ -441,6 +443,7 @@ class AbstractStructure extends AbstractView
* @param string $dataScope
* @param array $element
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function addElementToCollection(array & $collection, $elementName, $dataScope, array $element)
{
@@ -539,6 +542,7 @@ class AbstractStructure extends AbstractView
* @param array $one
* @param array $two
* @return int
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function sortChildren(array $one, array $two)
{
diff --git a/app/code/Magento/Ui/Component/Listing.php b/app/code/Magento/Ui/Component/Listing.php
index 8a0fffd534c..774d15ef1c5 100644
--- a/app/code/Magento/Ui/Component/Listing.php
+++ b/app/code/Magento/Ui/Component/Listing.php
@@ -58,6 +58,7 @@ class Listing extends AbstractView
* @param ActionPool $actionPool
* @param RowPool $dataProviderRowPool
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
TemplateContext $context,
diff --git a/app/code/Magento/Ui/DataProvider/Config/Converter.php b/app/code/Magento/Ui/DataProvider/Config/Converter.php
index f9de00aa191..7a3d8c2a29f 100644
--- a/app/code/Magento/Ui/DataProvider/Config/Converter.php
+++ b/app/code/Magento/Ui/DataProvider/Config/Converter.php
@@ -47,6 +47,7 @@ class Converter implements ConverterInterface
*
* @param \DOMNode $source
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function toArray(\DOMNode $source)
{
@@ -99,6 +100,8 @@ class Converter implements ConverterInterface
*
* @param \DOMDocument $source
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function convert($source)
{
diff --git a/app/code/Magento/Ui/DataProvider/Manager.php b/app/code/Magento/Ui/DataProvider/Manager.php
index a2db36660d1..6ab84dc8664 100644
--- a/app/code/Magento/Ui/DataProvider/Manager.php
+++ b/app/code/Magento/Ui/DataProvider/Manager.php
@@ -95,6 +95,7 @@ class Manager
* @param string $dataSource
* @param array $filters
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getData($dataSource, array $filters = [])
{
diff --git a/app/code/Magento/Ui/DataProvider/Metadata.php b/app/code/Magento/Ui/DataProvider/Metadata.php
index 11185631b34..e8f3cbe53d5 100644
--- a/app/code/Magento/Ui/DataProvider/Metadata.php
+++ b/app/code/Magento/Ui/DataProvider/Metadata.php
@@ -246,6 +246,9 @@ class Metadata implements \Iterator, \ArrayAccess
* @param string $name
* @param array $field
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function prepare($name, array & $field)
{
diff --git a/app/code/Magento/Ups/Helper/Config.php b/app/code/Magento/Ups/Helper/Config.php
index be82030aa0f..dd09f44816f 100644
--- a/app/code/Magento/Ups/Helper/Config.php
+++ b/app/code/Magento/Ups/Helper/Config.php
@@ -36,6 +36,7 @@ class Config
* Get configuration data of carrier
*
* @return array
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function getCodes()
{
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 8a5ea44b6ef..460bf55511c 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -13,6 +13,8 @@ use Magento\Ups\Helper\Config;
/**
* UPS shipping implementation
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Carrier extends AbstractCarrierOnline implements CarrierInterface
{
@@ -200,6 +202,9 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
*
* @param RateRequest $request
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function setRequest(RateRequest $request)
{
@@ -491,6 +496,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
*
* @param string $response
* @return Result
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _parseCgiResponse($response)
{
@@ -560,6 +566,9 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
* Get xml rates
*
* @return Result
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _getXmlQuotes()
{
@@ -747,6 +756,7 @@ XMLRequest;
*
* @param mixed $xmlResponse
* @return Result
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _parseXmlResponse($xmlResponse)
{
@@ -972,6 +982,8 @@ XMLAuth;
* @param string $trackingValue
* @param string $xmlResponse
* @return null
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
{
@@ -1133,6 +1145,9 @@ XMLAuth;
*
* @param \Magento\Framework\Object $request
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _formShipmentRequest(\Magento\Framework\Object $request)
{
@@ -1505,6 +1520,7 @@ XMLAuth;
*
* @param \Magento\Framework\Object|null $params
* @return array|bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getContainerTypes(\Magento\Framework\Object $params = null)
{
diff --git a/app/code/Magento/Ups/Model/Config/Source/OriginShipment.php b/app/code/Magento/Ups/Model/Config/Source/OriginShipment.php
index 0bdba07481a..3548cb03470 100644
--- a/app/code/Magento/Ups/Model/Config/Source/OriginShipment.php
+++ b/app/code/Magento/Ups/Model/Config/Source/OriginShipment.php
@@ -18,6 +18,7 @@ class OriginShipment extends \Magento\Ups\Model\Config\Source\Generic
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function toOptionArray()
{
diff --git a/app/code/Magento/Ups/Model/Config/Source/Unitofmeasure.php b/app/code/Magento/Ups/Model/Config/Source/Unitofmeasure.php
index 3dfc72c6ecd..793b2cb288e 100644
--- a/app/code/Magento/Ups/Model/Config/Source/Unitofmeasure.php
+++ b/app/code/Magento/Ups/Model/Config/Source/Unitofmeasure.php
@@ -18,6 +18,7 @@ class Unitofmeasure extends \Magento\Ups\Model\Config\Source\Generic
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function toOptionArray()
{
diff --git a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php
index d9a3df31f21..f37ce83f123 100644
--- a/app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php
+++ b/app/code/Magento/UrlRewrite/Block/Catalog/Product/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\UrlRewrite\Block\Catalog\Product;
* Products grid for URL rewrites editing
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
{
diff --git a/app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php b/app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php
index 79844fa883e..d9fabada7a1 100644
--- a/app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php
+++ b/app/code/Magento/UrlRewrite/Block/Cms/Page/Grid.php
@@ -8,6 +8,7 @@ namespace Magento\UrlRewrite\Block\Cms\Page;
* CMS pages grid for URL rewrites
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
*/
class Grid extends \Magento\Cms\Block\Adminhtml\Page\Grid
{
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index 048bf50ddba..587fb71a873 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -9,6 +9,8 @@ class Save extends \Magento\User\Controller\Adminhtml\User
{
/**
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/User/Model/Resource/User.php b/app/code/Magento/User/Model/Resource/User.php
index c1bde86fbb1..c27a049e6ee 100644
--- a/app/code/Magento/User/Model/Resource/User.php
+++ b/app/code/Magento/User/Model/Resource/User.php
@@ -11,6 +11,7 @@ use Magento\User\Model\User as ModelUser;
/**
* ACL user resource
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class User extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
diff --git a/app/code/Magento/Usps/Block/Rma/Adminhtml/Rma/Edit/Tab/General/Shipping/Packaging/Plugin.php b/app/code/Magento/Usps/Block/Rma/Adminhtml/Rma/Edit/Tab/General/Shipping/Packaging/Plugin.php
index ffb28539fe2..bf844ecc0d7 100644
--- a/app/code/Magento/Usps/Block/Rma/Adminhtml/Rma/Edit/Tab/General/Shipping/Packaging/Plugin.php
+++ b/app/code/Magento/Usps/Block/Rma/Adminhtml/Rma/Edit/Tab/General/Shipping/Packaging/Plugin.php
@@ -45,6 +45,7 @@ class Plugin
* @param \Magento\Framework\Object $subject $subject
* @param bool $result
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterIsGirthAllowed(\Magento\Framework\Object $subject, $result)
{
@@ -57,6 +58,7 @@ class Plugin
* @param \Magento\Framework\Object $subject
* @param \Closure $proceed
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundCheckSizeAndGirthParameter(\Magento\Framework\Object $subject, \Closure $proceed)
{
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 7f22a33a79b..3d7afd722b9 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -10,6 +10,8 @@ use Magento\Shipping\Model\Rate\Result;
/**
* USPS shipping
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\Carrier\CarrierInterface
{
@@ -194,6 +196,9 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @param \Magento\Sales\Model\Quote\Address\RateRequest $request
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function setRequest(\Magento\Sales\Model\Quote\Address\RateRequest $request)
{
@@ -361,6 +366,9 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @link http://www.usps.com/webtools/htm/Rate-Calculators-v2-3.htm
* @return Result
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _getXmlQuotes()
{
@@ -483,6 +491,8 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
* @param string $response
* @return Result
* @link http://www.usps.com/webtools/htm/Rate-Calculators-v2-3.htm
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _parseXmlResponse($response)
{
@@ -583,6 +593,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
* @param string $type
* @param string $code
* @return array|false
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getCode($type, $code = '')
{
@@ -1018,6 +1029,8 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
* @param string $trackingvalue
* @param string $response
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _parseXmlTrackingResponse($trackingvalue, $response)
{
@@ -1121,6 +1134,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @param string $countryId
* @return string|false
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _getCountryName($countryId)
{
@@ -1449,6 +1463,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
* @param string $serviceType
* @return string
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _formUsSignatureConfirmationShipmentRequest(\Magento\Framework\Object $request, $serviceType)
{
@@ -1548,6 +1563,9 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @param \Magento\Framework\Object $request
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _formIntlShipmentRequest(\Magento\Framework\Object $request)
{
@@ -1799,6 +1817,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
*
* @param \Magento\Framework\Object $request
* @return \Magento\Framework\Object
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _doShipmentRequest(\Magento\Framework\Object $request)
{
diff --git a/app/code/Magento/Weee/Helper/Data.php b/app/code/Magento/Weee/Helper/Data.php
index 893fcd3a25d..f928ee6c55b 100644
--- a/app/code/Magento/Weee/Helper/Data.php
+++ b/app/code/Magento/Weee/Helper/Data.php
@@ -209,6 +209,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param string $zone
* @param Store|int|string $store
* @return bool|int
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function typeOfDisplay(
$compareTo = null,
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 d9d09e6511f..a9435a88260 100644
--- a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -91,6 +91,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
*
* @param \Magento\Catalog\Model\Product $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function afterLoad($object)
{
diff --git a/app/code/Magento/Weee/Model/Observer.php b/app/code/Magento/Weee/Model/Observer.php
index 4798e0e61a3..f5dfe7366b5 100644
--- a/app/code/Magento/Weee/Model/Observer.php
+++ b/app/code/Magento/Weee/Model/Observer.php
@@ -4,6 +4,9 @@
*/
namespace Magento\Weee\Model;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Observer extends \Magento\Framework\Model\AbstractModel
{
/**
@@ -44,6 +47,7 @@ class Observer extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
index 98b9608ffae..d0541cef951 100644
--- a/app/code/Magento/Weee/Model/Tax.php
+++ b/app/code/Magento/Weee/Model/Tax.php
@@ -10,6 +10,9 @@ use Magento\Store\Model\Website;
use Magento\Tax\Model\Calculation;
use Magento\Customer\Api\AccountManagementInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Tax extends \Magento\Framework\Model\AbstractModel
{
/**
@@ -95,6 +98,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
* @param PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -196,6 +200,8 @@ class Tax extends \Magento\Framework\Model\AbstractModel
* @param Website $website
* @param bool $calculateTax
* @return \Magento\Framework\Object[]
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function getProductWeeeAttributes(
$product,
diff --git a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
index 0dfc5cebce1..94f91dbc529 100644
--- a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
@@ -37,6 +37,10 @@ class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
*
* @param Creditmemo $creditmemo
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function collect(Creditmemo $creditmemo)
{
diff --git a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
index d0539a81325..b56ff8e5119 100644
--- a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
@@ -35,6 +35,9 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
*
* @param \Magento\Sales\Model\Order\Invoice $invoice
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
{
diff --git a/app/code/Magento/Weee/Model/Total/Quote/Weee.php b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
index a7a8729da4e..2c51cd9b25d 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
@@ -125,6 +125,8 @@ class Weee extends AbstractTotal
* @param \Magento\Sales\Model\Quote\Address $address
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
* @return void|$this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _process(\Magento\Sales\Model\Quote\Address $address, $item)
{
diff --git a/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php b/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php
index 00a5bfb2c0e..5f07f635353 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php
@@ -15,6 +15,8 @@ class WeeeTax extends Weee
*
* @param \Magento\Sales\Model\Quote\Address $address
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function collect(\Magento\Sales\Model\Quote\Address $address)
{
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
index c4138de7ccd..b66fa238951 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
@@ -118,6 +118,7 @@ class Chooser extends \Magento\Backend\Block\Template
* Flag to indicate include hidden field before chooser or not
*
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getHiddenEnabled()
{
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
index c64afb4fe28..ec57db24f39 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -108,6 +108,7 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
* Prepare form before rendering HTML
*
* @return $this
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index fa1e2b20962..2c1848c89a6 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -184,6 +184,7 @@ class Layout extends \Magento\Backend\Block\Template implements \Magento\Framewo
* Generate array of parameters for every container type to create html template
*
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getDisplayOnContainers()
{
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
index 614eeaa7eb2..c39bcfb8844 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
@@ -10,6 +10,9 @@
*/
namespace Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implements
\Magento\Backend\Block\Widget\Tab\TabInterface
{
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
index 7d608517667..c1aaf3eb8ba 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -133,6 +133,8 @@ class Options extends \Magento\Backend\Block\Widget\Form\Generic
*
* @param \Magento\Framework\Object $parameter
* @return \Magento\Framework\Data\Form\Element\AbstractElement
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _addField($parameter)
{
diff --git a/app/code/Magento/Widget/Model/NamespaceResolver.php b/app/code/Magento/Widget/Model/NamespaceResolver.php
index 6dc65251323..1cd22a5a64e 100644
--- a/app/code/Magento/Widget/Model/NamespaceResolver.php
+++ b/app/code/Magento/Widget/Model/NamespaceResolver.php
@@ -33,6 +33,8 @@ class NamespaceResolver
* @param string $name
* @param bool $asFullModuleName
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function determineOmittedNamespace($name, $asFullModuleName = false)
{
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 695345a62c8..a7a8a59c8f0 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -6,6 +6,7 @@ namespace Magento\Widget\Model\Template;
/**
* Template Filter Model
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Filter extends \Magento\Cms\Model\Template\Filter
{
@@ -33,6 +34,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
* @param \Magento\Backend\Model\UrlInterface $backendUrlBuilder
* @param \Magento\Widget\Model\Resource\Widget $widgetResource
* @param \Magento\Widget\Model\Widget $widget
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Stdlib\String $string,
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index 7511d0fa9b6..df0679c6def 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -116,6 +116,8 @@ class Widget
*
* @param string $type Widget type
* @return \Magento\Framework\Object
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getConfigAsObject($type)
{
diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php
index e64b2251429..8a005665f6f 100644
--- a/app/code/Magento/Widget/Model/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/Widget/Instance.php
@@ -17,6 +17,7 @@ use Magento\Framework\App\Filesystem\DirectoryList;
* @method \Magento\Widget\Model\Widget\Instance setSortOrder(int $value)
* @method \Magento\Widget\Model\Widget\Instance setThemeId(int $value)
* @method int getThemeId()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Instance extends \Magento\Framework\Model\AbstractModel
{
@@ -122,6 +123,7 @@ class Instance extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $relatedCacheTypes
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -186,6 +188,8 @@ class Instance extends \Magento\Framework\Model\AbstractModel
* Processing object before save data
*
* @return $this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function beforeSave()
{
@@ -407,6 +411,7 @@ class Instance extends \Magento\Framework\Model\AbstractModel
* Load widget XML config and merge with theme widget config
*
* @return array|null
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getWidgetConfigAsArray()
{
@@ -531,6 +536,8 @@ class Instance extends \Magento\Framework\Model\AbstractModel
* @param string $container
* @param string $templatePath
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function generateLayoutUpdateXml($container, $templatePath = '')
{
diff --git a/app/code/Magento/Wishlist/Block/AbstractBlock.php b/app/code/Magento/Wishlist/Block/AbstractBlock.php
index 6640d6b53a4..b3a9ca04796 100644
--- a/app/code/Magento/Wishlist/Block/AbstractBlock.php
+++ b/app/code/Magento/Wishlist/Block/AbstractBlock.php
@@ -80,6 +80,7 @@ abstract class AbstractBlock extends \Magento\Catalog\Block\Product\AbstractProd
*
* @param \Magento\Wishlist\Model\Resource\Item\Collection $collection
* @return \Magento\Wishlist\Block\Customer\Wishlist
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _prepareCollection($collection)
{
diff --git a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
index 246493b70ae..a509518c737 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
@@ -56,6 +56,7 @@ class Sidebar extends \Magento\Wishlist\Block\AbstractBlock implements \Magento\
*
* @deprecated after 1.6.2.0
* @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getCanDisplayWishlist()
{
diff --git a/app/code/Magento/Wishlist/Controller/Index/Add.php b/app/code/Magento/Wishlist/Controller/Index/Add.php
index 7b45de5f6fd..d54f124b016 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Add.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Add.php
@@ -51,6 +51,9 @@ class Add extends Action\Action implements IndexInterface
*
* @return void
* @throws NotFoundException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function execute()
{
diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
index edb018b57b8..795ed6717c6 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php
@@ -9,6 +9,9 @@ use Magento\Framework\App\Action;
use Magento\Framework\App\ResponseInterface;
use Magento\Wishlist\Controller\IndexInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Cart extends Action\Action implements IndexInterface
{
/**
@@ -91,6 +94,8 @@ class Cart extends Action\Action implements IndexInterface
* to product view page with message about needed defined required options
*
* @return ResponseInterface
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
index 08d34978829..e7baa39cb16 100644
--- a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
+++ b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
@@ -32,6 +32,8 @@ class DownloadCustomOption extends Action\Action implements IndexInterface
* Custom options download action
*
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.ExitExpression)
*/
public function execute()
{
diff --git a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
index 8b822593a94..7b3354bb06f 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
@@ -33,6 +33,7 @@ class Fromcart extends Action\Action implements IndexInterface
*
* @return \Zend_Controller_Response_Abstract
* @throws NotFoundException
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function execute()
{
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index 3d1e22d6892..c7558308201 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -10,6 +10,9 @@ use Magento\Framework\App\Action\NotFoundException;
use Magento\Framework\App\ResponseInterface;
use Magento\Wishlist\Controller\IndexInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Send extends Action\Action implements IndexInterface
{
/**
@@ -82,6 +85,9 @@ class Send extends Action\Action implements IndexInterface
*
* @return ResponseInterface|void
* @throws NotFoundException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function execute()
{
diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index 40c1e7dbee4..186157e8ae6 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -50,6 +50,8 @@ class Update extends Action\Action implements IndexInterface
*
* @return ResponseInterface|void
* @throws NotFoundException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/Wishlist/Controller/WishlistProvider.php b/app/code/Magento/Wishlist/Controller/WishlistProvider.php
index cd810cda324..01225277201 100644
--- a/app/code/Magento/Wishlist/Controller/WishlistProvider.php
+++ b/app/code/Magento/Wishlist/Controller/WishlistProvider.php
@@ -54,6 +54,7 @@ class WishlistProvider implements WishlistProviderInterface
/**
* {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getWishlist($wishlistId = null)
{
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 65874e652d2..7af5012d2ae 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -10,6 +10,7 @@ use Magento\Wishlist\Controller\WishlistProviderInterface;
* Wishlist Data Helper
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
diff --git a/app/code/Magento/Wishlist/Helper/Rss.php b/app/code/Magento/Wishlist/Helper/Rss.php
index 513969f6723..27b24750b8b 100644
--- a/app/code/Magento/Wishlist/Helper/Rss.php
+++ b/app/code/Magento/Wishlist/Helper/Rss.php
@@ -5,6 +5,9 @@
namespace Magento\Wishlist\Helper;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Rss extends \Magento\Wishlist\Helper\Data
{
/**
@@ -34,6 +37,7 @@ class Rss extends \Magento\Wishlist\Helper\Data
* @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
* @param \Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php
index 284118a5eef..cc3f2edf3a3 100644
--- a/app/code/Magento/Wishlist/Model/Item.php
+++ b/app/code/Magento/Wishlist/Model/Item.php
@@ -26,6 +26,7 @@ use Magento\Wishlist\Model\Resource\Item\Option\CollectionFactory;
* @method \Magento\Wishlist\Model\Item setAddedAt(string $value)
* @method string getDescription()
* @method \Magento\Wishlist\Model\Item setDescription(string $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Item extends AbstractModel implements ItemInterface
{
@@ -131,6 +132,7 @@ class Item extends AbstractModel implements ItemInterface
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
diff --git a/app/code/Magento/Wishlist/Model/ItemCarrier.php b/app/code/Magento/Wishlist/Model/ItemCarrier.php
index a492568b03d..39e8e983f1d 100644
--- a/app/code/Magento/Wishlist/Model/ItemCarrier.php
+++ b/app/code/Magento/Wishlist/Model/ItemCarrier.php
@@ -14,6 +14,9 @@ use Magento\Framework\Message\ManagerInterface as MessageManager;
use Magento\Framework\UrlInterface;
use Magento\Wishlist\Helper\Data as WishlistHelper;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class ItemCarrier
{
/**
@@ -100,6 +103,9 @@ class ItemCarrier
* @param Wishlist $wishlist
* @param array $qtys
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function moveAllToCart(Wishlist $wishlist, $qtys)
{
diff --git a/app/code/Magento/Wishlist/Model/Observer.php b/app/code/Magento/Wishlist/Model/Observer.php
index e20109f60c1..1ab18bf1ea1 100644
--- a/app/code/Magento/Wishlist/Model/Observer.php
+++ b/app/code/Magento/Wishlist/Model/Observer.php
@@ -121,6 +121,7 @@ class Observer
/**
* @param \Magento\Framework\Event\Observer $observer
* @return void
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function processAddToCart($observer)
{
@@ -176,6 +177,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function customerLogin(\Magento\Framework\Event\Observer $observer)
{
@@ -189,6 +191,7 @@ class Observer
*
* @param \Magento\Framework\Event\Observer $observer
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function customerLogout(\Magento\Framework\Event\Observer $observer)
{
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
index 8ab2536a38a..d611a28011e 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
@@ -6,6 +6,8 @@ namespace Magento\Wishlist\Model\Resource\Item;
/**
* Wishlist item collection
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
{
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
index 06c7bd3b58e..01b96becde9 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
@@ -10,6 +10,9 @@ namespace Magento\Wishlist\Model\Resource\Item\Collection;
use Magento\Customer\Controller\RegistryConstants as RegistryConstants;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
{
/**
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 574d389c9eb..b094d118f44 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -22,6 +22,7 @@ use Magento\Wishlist\Model\Resource\Wishlist\Collection;
* @method \Magento\Wishlist\Model\Wishlist setSharingCode(string $value)
* @method string getUpdatedAt()
* @method \Magento\Wishlist\Model\Wishlist setUpdatedAt(string $value)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Object\IdentityInterface
{
@@ -134,6 +135,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
* @param ProductRepositoryInterface $productRepository
* @param bool $useCurrentWebsite
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -369,6 +371,8 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
* @param bool $forciblySetQty
* @throws \Magento\Framework\Model\Exception
* @return Item|string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addNewItem($product, $buyRequest = null, $forciblySetQty = false)
{
@@ -599,6 +603,8 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
* @throws Exception
*
* @see \Magento\Catalog\Helper\Product::addParamsToBuyRequest()
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function updateItem($itemId, $buyRequest, $params = null)
{
--
GitLab
From 2080fea485b7500250d22a1e58d5471dfcd5a93a Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Tue, 6 Jan 2015 14:33:01 +0200
Subject: [PATCH 031/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- Updated LiveCodeTest to use github changes
- Refactored test framework helper code
---
.../Tool/BlacklistInterface.php | 18 +++
.../CodingStandard/Tool/CodeMessDetector.php | 32 ++--
.../CodingStandard/Tool/CodeSniffer.php | 80 ++++------
.../CodingStandard/Tool/CopyPasteDetector.php | 36 +++--
.../Tool/ExtensionInterface.php | 19 +++
.../CodingStandard/ToolInterface.php | 7 +-
.../CodingStandard/Tool/CodeSnifferTest.php | 5 -
.../Magento/Test/Php/LiveCodeTest.php | 108 +++++--------
.../Test/Php/_files/blacklist/common.txt | 118 --------------
.../Php/_files/phpcs/blacklist/common.txt | 41 -----
.../Php/_files/phpcs/whitelist/common.txt | 8 -
.../Test/Php/_files/whitelist/common.txt | 151 +-----------------
12 files changed, 153 insertions(+), 470 deletions(-)
create mode 100644 dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php
create mode 100644 dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/ExtensionInterface.php
delete mode 100644 dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt
delete mode 100644 dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
delete mode 100644 dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/whitelist/common.txt
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php
new file mode 100644
index 00000000000..487d0758338
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\TestFramework\CodingStandard\Tool;
+
+interface BlacklistInterface
+{
+ /**
+ * Set list of paths to be excluded from tool run
+ *
+ * @param array $blackList
+ * @return void
+ */
+ public function setBlackList(array $blackList);
+}
\ No newline at end of file
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php
index a3e4ebeb972..f52b7d64d21 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php
@@ -8,21 +8,23 @@
*/
namespace Magento\TestFramework\CodingStandard\Tool;
-class CodeMessDetector implements \Magento\TestFramework\CodingStandard\ToolInterface
+use \Magento\TestFramework\CodingStandard\ToolInterface;
+
+class CodeMessDetector implements ToolInterface
{
/**
* Ruleset directory
*
* @var string
*/
- protected $_rulesetFile;
+ private $rulesetFile;
/**
* Report file
*
* @var string
*/
- protected $_reportFile;
+ private $reportFile;
/**
* Constructor
@@ -32,8 +34,8 @@ class CodeMessDetector implements \Magento\TestFramework\CodingStandard\ToolInte
*/
public function __construct($rulesetFile, $reportFile)
{
- $this->_reportFile = $reportFile;
- $this->_rulesetFile = $rulesetFile;
+ $this->reportFile = $reportFile;
+ $this->rulesetFile = $rulesetFile;
}
/**
@@ -47,25 +49,21 @@ class CodeMessDetector implements \Magento\TestFramework\CodingStandard\ToolInte
}
/**
- * Run tool for files specified
- *
- * @param array $whiteList Files/directories to be inspected
- * @param array $blackList Files/directories to be excluded from the inspection
- * @param array $extensions Array of alphanumeric strings, for example: 'php', 'xml', 'phtml', 'css'...
- *
- * @return int
+ * {@inheritdoc}
*/
- public function run(array $whiteList, array $blackList = [], array $extensions = [])
+ public function run(array $whiteList)
{
+ if (empty($whiteList)) {
+ return \PHP_PMD_TextUI_Command::EXIT_SUCCESS;
+ }
+
$commandLineArguments = [
'run_file_mock', //emulate script name in console arguments
implode(',', $whiteList),
'xml', //report format
- $this->_rulesetFile,
- '--exclude',
- implode(',', $blackList),
+ $this->rulesetFile,
'--reportfile',
- $this->_reportFile,
+ $this->reportFile,
];
$options = new \PHP_PMD_TextUI_CommandLineOptions($commandLineArguments);
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
index edc994e2c03..b0525aad027 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
@@ -11,28 +11,35 @@ namespace Magento\TestFramework\CodingStandard\Tool;
use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper;
use Magento\TestFramework\CodingStandard\ToolInterface;
-class CodeSniffer implements ToolInterface
+class CodeSniffer implements ToolInterface, ExtensionInterface
{
/**
* Ruleset directory
*
* @var string
*/
- protected $rulesetDir;
+ private $rulesetDir;
/**
* Report file
*
* @var string
*/
- protected $reportFile;
+ private $reportFile;
/**
* PHPCS cli tool wrapper
*
* @var Wrapper
*/
- protected $wrapper;
+ private $wrapper;
+
+ /**
+ * List of extensions for tool run
+ *
+ * @var array
+ */
+ private $extensions = ['php'];
/**
* Constructor
@@ -49,64 +56,41 @@ class CodeSniffer implements ToolInterface
}
/**
- * Whether the tool can be ran on the current environment
- *
- * @return bool
+ * {@inheritdoc}
*/
- public function canRun()
+ public function setExtensions(array $extensions)
{
- return class_exists('PHP_CodeSniffer_CLI');
+ $this->extensions = $extensions;
}
/**
- * Return the version of code sniffer found
+ * Whether the tool can be ran on the current environment
*
- * @return string
+ * @return bool
*/
- public function version()
+ public function canRun()
{
- return $this->wrapper->version();
+ return class_exists('PHP_CodeSniffer_CLI');
}
/**
- * Run tool for files specified
- *
- * @param array $whiteList Files/directories to be inspected
- * @param array $blackList Files/directories to be excluded from the inspection
- * @param array $extensions Array of alphanumeric strings, for example: 'php', 'xml', 'phtml', 'css'...
- * @param int $warningSeverity Severity level of warnings, default is 0
- *
- * @return int
+ * {@inheritdoc}
*/
- public function run(
- array $whiteList,
- array $blackList = [],
- array $extensions = [],
- $warningSeverity = 0
- ) {
- $whiteList = array_map(
- function ($item) {
- return $item;
- },
- $whiteList
- );
-
- $blackList = array_map(
- function ($item) {
- return preg_quote($item);
- },
- $blackList
- );
+ public function run(array $whiteList)
+ {
+ if (empty($whiteList)) {
+ return 0;
+ }
$this->wrapper->checkRequirements();
$settings = $this->wrapper->getDefaults();
$settings['files'] = $whiteList;
$settings['standard'] = [$this->rulesetDir];
- $settings['ignored'] = $blackList;
- $settings['extensions'] = $extensions;
+ $settings['extensions'] = $this->extensions;
$settings['reportFile'] = $this->reportFile;
- $settings['warningSeverity'] = $warningSeverity;
+ $settings['warningSeverity'] = 0;
$settings['reports']['checkstyle'] = null;
+
$this->wrapper->setValues($settings);
ob_start();
@@ -115,14 +99,4 @@ class CodeSniffer implements ToolInterface
return $result;
}
-
- /**
- * Get report file
- *
- * @return string
- */
- public function getReportFile()
- {
- return $this->reportFile;
- }
}
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php
index fb096ac48dd..66a60989ba2 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php
@@ -8,14 +8,23 @@
*/
namespace Magento\TestFramework\CodingStandard\Tool;
-class CopyPasteDetector implements \Magento\TestFramework\CodingStandard\ToolInterface
+use Magento\TestFramework\CodingStandard\ToolInterface;
+
+class CopyPasteDetector implements ToolInterface, BlacklistInterface
{
/**
* Report file
*
* @var string
*/
- protected $_reportFile;
+ private $reportFile;
+
+ /**
+ * List of paths to be excluded from tool run
+ *
+ * @var array
+ */
+ private $blacklist;
/**
* Constructor
@@ -24,7 +33,15 @@ class CopyPasteDetector implements \Magento\TestFramework\CodingStandard\ToolInt
*/
public function __construct($reportFile)
{
- $this->_reportFile = $reportFile;
+ $this->reportFile = $reportFile;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setBlackList(array $blackList)
+ {
+ $this->blacklist = $blackList;
}
/**
@@ -44,17 +61,14 @@ class CopyPasteDetector implements \Magento\TestFramework\CodingStandard\ToolInt
* Run tool for files specified
*
* @param array $whiteList Files/directories to be inspected
- * @param array $blackList Files/directories to be excluded from the inspection
- * @param array $extensions Array of alphanumeric strings, for example: 'php', 'xml', 'phtml', 'css'...
+ * @return int
*
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
- *
- * @return int
*/
- public function run(array $whiteList, array $blackList = [], array $extensions = [])
+ public function run(array $whiteList)
{
$blackListStr = ' ';
- foreach ($blackList as $file) {
+ foreach ($this->blacklist as $file) {
$file = escapeshellarg(trim($file));
if (!$file) {
continue;
@@ -63,8 +77,8 @@ class CopyPasteDetector implements \Magento\TestFramework\CodingStandard\ToolInt
}
$command = 'phpcpd' . ' --log-pmd ' . escapeshellarg(
- $this->_reportFile
- ) . ' --min-lines 13' . $blackListStr . ' ' . BP;
+ $this->reportFile
+ ) . ' --min-lines 13' . $blackListStr . ' ' . implode(' ', $whiteList);
exec($command, $output, $exitCode);
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/ExtensionInterface.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/ExtensionInterface.php
new file mode 100644
index 00000000000..08b405ab3d7
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/ExtensionInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\TestFramework\CodingStandard\Tool;
+
+interface ExtensionInterface
+{
+ /**
+ * Set extensions for tool to run
+ * Example: 'php', 'xml', 'phtml', 'css'
+ *
+ * @param array $extensions
+ * @return void
+ */
+ public function setExtensions(array $extensions);
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/ToolInterface.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/ToolInterface.php
index 4c23b8b6f17..27c83856102 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/ToolInterface.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/ToolInterface.php
@@ -18,13 +18,10 @@ interface ToolInterface
public function canRun();
/**
- * Run tool for files cpecified
+ * Run tool for files specified
*
* @param array $whiteList Files/directories to be inspected
- * @param array $blackList Files/directories to be excluded from the inspection
- * @param array $extensions Array of alphanumeric strings, for example: 'php', 'xml', 'phtml', 'css'...
- *
* @return int
*/
- public function run(array $whiteList, array $blackList = [], array $extensions = []);
+ public function run(array $whiteList);
}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
index b1f712764f2..af9018f7008 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
@@ -60,9 +60,4 @@ class CodeSnifferTest extends \PHPUnit_Framework_TestCase
$this->_tool->run($whiteList, $blackList, $extensions);
}
-
- public function testGetReportFile()
- {
- $this->assertEquals(self::REPORT_FILE, $this->_tool->getReportFile());
- }
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 65dc86503fe..cf45282b97a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -28,16 +28,6 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
*/
protected static $pathToSource = '';
- /**
- * @var array
- */
- protected static $whiteList = [];
-
- /**
- * @var array
- */
- protected static $blackList = [];
-
/**
* Setup basics for all tests
*
@@ -50,22 +40,39 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
if (!is_dir(self::$reportDir)) {
mkdir(self::$reportDir, 0777);
}
- self::setupFileLists();
}
/**
- * Helper method to setup the black and white lists
+ * Returns whitelist based on blacklist and git changed files
*
- * @param string $type
- * @return void
+ * @param array $fileTypes
+ * @return array
*/
- public static function setupFileLists($type = '')
+ public static function getWhitelist($fileTypes = ['php'])
{
- if ($type != '' && !preg_match('/\/$/', $type)) {
- $type = $type . '/';
+ $directoriesToCheck = file(__DIR__ . '/_files/whitelist/whitelist.txt', FILE_IGNORE_NEW_LINES);
+
+ $changedFiles = array_filter(
+ Utility\Files::readLists(__DIR__ . '/_files/changed_files.txt'),
+ function ($path) use ($directoriesToCheck) {
+ foreach ($directoriesToCheck as $directory) {
+ if (strpos($path, BP . '/' . $directory) === 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+ );
+ if (!empty($fileTypes)) {
+ $changedFiles = array_filter(
+ $changedFiles,
+ function ($path) use ($fileTypes) {
+ return in_array(pathinfo($path, PATHINFO_EXTENSION), $fileTypes);
+ }
+ );
}
- self::$whiteList = Utility\Files::readLists(__DIR__ . '/_files/' . $type . 'whitelist/*.txt');
- self::$blackList = Utility\Files::readLists(__DIR__ . '/_files/' . $type . 'blacklist/*.txt');
+
+ return $changedFiles;
}
/**
@@ -82,15 +89,12 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
if (!$codeSniffer->canRun()) {
$this->markTestSkipped('PHP Code Sniffer is not installed.');
}
- if (version_compare($codeSniffer->version(), '1.4.7') === -1) {
+ if (version_compare($wrapper->version(), '1.4.7') === -1) {
$this->markTestSkipped('PHP Code Sniffer Build Too Old.');
}
- self::setupFileLists('phpcs');
- $result = $codeSniffer->run(self::$whiteList, self::$blackList, ['php']);
- $this->assertFileExists(
- $reportFile,
- 'Expected ' . $reportFile . ' to be created by phpcs run with PSR2 standard'
- );
+
+ $result = $codeSniffer->run(self::getWhitelist());
+
$this->assertEquals(
0,
$result,
@@ -111,8 +115,8 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
if (!$codeSniffer->canRun()) {
$this->markTestSkipped('PHP Code Sniffer is not installed.');
}
- self::setupFileLists();
- $result = $codeSniffer->run(self::$whiteList, self::$blackList, ['php', 'phtml']);
+ $codeSniffer->setExtensions(['php', 'phtml']);
+ $result = $codeSniffer->run(self::getWhitelist(['php', 'phtml']));
$this->assertEquals(
0,
$result,
@@ -138,12 +142,11 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
if (!$codeSniffer->canRun()) {
$this->markTestSkipped('PHP Code Sniffer is not installed.');
}
- self::setupFileLists('phpcs');
- $severity = 0; // Change to 5 to see the warnings
+ $result = $codeSniffer->run(self::getWhitelist(['php']));
$this->assertEquals(
0,
- $result = $codeSniffer->run(self::$whiteList, self::$blackList, ['php'], $severity),
+ $result,
"PHP Code Sniffer has found {$result} error(s): See detailed report in {$reportFile}"
);
}
@@ -157,12 +160,7 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
*/
public function testCodeMess($whiteList)
{
- if (count($whiteList) == 1) {
- $formattedPath = preg_replace('~/~', '_', preg_replace('~' . self::$pathToSource . '~', '', $whiteList[0]));
- } else {
- $formattedPath = '_app_lib';
- }
- $reportFile = self::$reportDir . '/phpmd_report' . $formattedPath . '.xml';
+ $reportFile = self::$reportDir . '/phpmd_report.xml';
$codeMessDetector = new CodeMessDetector(realpath(__DIR__ . '/_files/phpmd/ruleset.xml'), $reportFile);
if (!$codeMessDetector->canRun()) {
@@ -171,39 +169,14 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
$this->assertEquals(
PHP_PMD_TextUI_Command::EXIT_SUCCESS,
- $codeMessDetector->run($whiteList, self::$blackList),
+ $codeMessDetector->run(self::getWhitelist(['php'])),
"PHP Code Mess has found error(s): See detailed report in {$reportFile}"
);
// delete empty reports
- unlink($reportFile);
- }
-
- /**
- * To improve the test execution performance the whitelist is split into smaller parts:
- * - in case of dev code (tests, tools, etc) each whitelist entry is fed separately to phpmd
- * - app/lib code is still being executed within a single whitelist to make sure that all design
- * metrics (depth of inheritance, number of children, etc.) are being calculated in a correct way.
- * @return array
- */
- public function whiteListDataProvider()
- {
- $whiteList = [];
- $testCodePattern = '~' . self::$pathToSource . '/dev/~';
- $nonTestCode = [];
-
- self::setupFileLists();
-
- foreach (self::$whiteList as $path) {
- if (!preg_match($testCodePattern, $path)) {
- $nonTestCode[] = $path;
- } else {
- $whiteList[] = [[$path]];
- }
+ if (file_exists($reportFile)) {
+ unlink($reportFile);
}
- $whiteList[] = [$nonTestCode];
-
- return $whiteList;
}
/**
@@ -220,14 +193,15 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
$this->markTestSkipped('PHP Copy/Paste Detector is not available.');
}
- self::setupFileLists();
$blackList = [];
foreach (glob(__DIR__ . '/_files/phpcpd/blacklist/*.txt') as $list) {
$blackList = array_merge($blackList, file($list, FILE_IGNORE_NEW_LINES));
}
+ $copyPasteDetector->setBlackList($blackList);
+
$this->assertTrue(
- $copyPasteDetector->run([], $blackList),
+ $copyPasteDetector->run([BP]),
"PHP Copy/Paste Detector has found error(s): See detailed report in {$reportFile}"
);
}
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
deleted file mode 100644
index 8b0e96b4500..00000000000
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-# Files or directories that are excluded from static code analysis for any reason
-# Glob patterns are supported
-# Overrides the white list
-#
-app/code/Magento/Backend/Model/Config.php
-app/code/Magento/Backend/Model/Config/Structure/Converter.php
-app/code/Magento/Backend/Model/Menu/Config.php
-app/code/Magento/Backend/Block/Widget/Grid
-app/code/Magento/Backend/view
-app/code/Magento/ConfigurableProduct/view
-app/code/Magento/DesignEditor/view
-app/code/Magento/Email/view
-app/code/Magento/Integration/view
-app/code/Magento/Msrp/view
-app/code/Magento/Theme/view
-app/code/Magento/User/view
-app/code/Magento/Webapi/view
-app/code/Magento/GroupedProduct/view
-app/code/Magento/Rss/view
-app/code/Magento/UrlRewrite/view
-dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
-dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
-dev/tests/integration/framework/Magento/TestFramework/Db/ConnectionAdapter.php
-dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
-dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
-dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/TemplateFilesTest.php
-dev/tests/integration/testsuite/Magento/Backend/Block/System/Config/FormStub.php
-dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture
-dev/tests/integration/testsuite/Magento/Framework/Code/_expected
-dev/tests/integration/tmp
-dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input
-dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input
-dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/expected
-dev/tests/static/testsuite/Magento/Test/Legacy/_files
-dev/tests/unit/testsuite/Magento/Core/Model/Resource/Db/AbstractTest.php
-dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files
-dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
-dev/tests/unit/testsuite/Magento/Framework/View/TemplateEngine/_files
-lib/internal/Magento/Framework/App/Config/Element.php
-lib/internal/Magento/Framework/Archive
-lib/internal/Magento/Framework/Backup
-lib/internal/Magento/Framework/Cache/Backend/Database.php
-lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
-lib/internal/Magento/Framework/Cache/Backend/Memcached.php
-lib/internal/Magento/Framework/Cache/Core.php
-lib/internal/Magento/Framework/Data/Collection.php
-lib/internal/Magento/Framework/Data/Collection/Db.php
-lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Cache.php
-lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategy/Query.php
-lib/internal/Magento/Framework/Data/Collection/Db/FetchStrategyInterface.php
-lib/internal/Magento/Framework/Data/Collection/Filesystem.php
-lib/internal/Magento/Framework/Data/Form.php
-lib/internal/Magento/Framework/Data/Form/AbstractForm.php
-lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
-lib/internal/Magento/Framework/Data/Form/Element/Button.php
-lib/internal/Magento/Framework/Data/Form/Element/Checkbox.php
-lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
-lib/internal/Magento/Framework/Data/Form/Element/Collection.php
-lib/internal/Magento/Framework/Data/Form/Element/Column.php
-lib/internal/Magento/Framework/Data/Form/Element/Date.php
-lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
-lib/internal/Magento/Framework/Data/Form/Element/Editor.php
-lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
-lib/internal/Magento/Framework/Data/Form/Element/File.php
-lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
-lib/internal/Magento/Framework/Data/Form/Element/Hidden.php
-lib/internal/Magento/Framework/Data/Form/Element/Image.php
-lib/internal/Magento/Framework/Data/Form/Element/Imagefile.php
-lib/internal/Magento/Framework/Data/Form/Element/Label.php
-lib/internal/Magento/Framework/Data/Form/Element/Link.php
-lib/internal/Magento/Framework/Data/Form/Element/Multiline.php
-lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
-lib/internal/Magento/Framework/Data/Form/Element/Note.php
-lib/internal/Magento/Framework/Data/Form/Element/Obscure.php
-lib/internal/Magento/Framework/Data/Form/Element/Password.php
-lib/internal/Magento/Framework/Data/Form/Element/Radio.php
-lib/internal/Magento/Framework/Data/Form/Element/Radios.php
-lib/internal/Magento/Framework/Data/Form/Element/Renderer/RendererInterface.php
-lib/internal/Magento/Framework/Data/Form/Element/Reset.php
-lib/internal/Magento/Framework/Data/Form/Element/Select.php
-lib/internal/Magento/Framework/Data/Form/Element/Submit.php
-lib/internal/Magento/Framework/Data/Form/Element/Text.php
-lib/internal/Magento/Framework/Data/Form/Element/Textarea.php
-lib/internal/Magento/Framework/Data/Form/Element/Time.php
-lib/internal/Magento/Framework/Data/Form/Filter/Date.php
-lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
-lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php
-lib/internal/Magento/Framework/Data/Form/Filter/Striptags.php
-lib/internal/Magento/Framework/Data/Tree.php
-lib/internal/Magento/Framework/Data/Tree/Db.php
-lib/internal/Magento/Framework/Data/Tree/Dbp.php
-lib/internal/Magento/Framework/Data/Tree/Node.php
-lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
-lib/internal/Magento/Framework/DB
-lib/internal/Magento/Framework/Stdlib/DateTime.php
-lib/internal/Magento/Framework/Debug.php
-lib/internal/Magento/Framework/Event.php
-lib/internal/Magento/Framework/Event
-lib/internal/Magento/Framework/File/Csv.php
-lib/internal/Magento/Framework/File/CsvMulty.php
-lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
-lib/internal/Magento/Framework/File/Uploader.php
-lib/internal/Magento/Framework/Gdata
-lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
-lib/internal/Magento/Framework/HTTP/Client.php
-lib/internal/Magento/Framework/HTTP/Client/Curl.php
-lib/internal/Magento/Framework/HTTP/Client/Socket.php
-lib/internal/Magento/Framework/HTTP/ClientInterface.php
-lib/internal/Magento/Framework/Image
-lib/internal/Magento/Framework/Image.php
-lib/internal/Magento/Framework/Io
-lib/internal/Magento/Framework/Object
-lib/internal/Magento/Framework/Object.php
-lib/internal/Magento/Framework/Simplexml
-lib/internal/Magento/Framework/System
-lib/internal/Magento/Framework/Util.php
-lib/internal/Magento/Framework/Xml
-vendor
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
deleted file mode 100644
index b08055eedb4..00000000000
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-# Files or directories that are excluded from static code analysis for any reason
-# Glob patterns are supported
-# Overrides the white list
-#
-# Formatter introduces long line
-app/bootstrap.php
-# Formatter introduces long line
-app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
-# Formatter introduces long line
-app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
-# Formatter introduces long line
-app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
-# Formatter introduces long line
-app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
-# Formatter introduces long line
-app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
-# Formatter introduces long line
-app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
-# Formatter introduces long line
-app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
-# Formatter introduces long line
-app/code/Magento/Backend/Block/System/Store/Edit.php
-# Not magento code
-dev/tools/layout
-# PSR-1 not applied to
-dev/tests/js
-# Example files that are expected to fail code sniffer
-dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input
-# Example files that are expected to fail code mess detector
-dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input
-# __ method for Translate cannot be in camelCase
-lib/internal/Magento/Framework/Translate/Adapter.php
-# __ method for Translate cannot be in camelCase
-lib/internal/Magento/Framework/Translate/AdapterInterface.php
-# PSR-1 not applied to
-dev/tests/integration/testsuite/Magento
-# PSR-1 not applied to
-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
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/whitelist/common.txt
deleted file mode 100644
index bd9a1028a5e..00000000000
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/whitelist/common.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Files or directories that are included into php code sniffer analysis
-# Glob patterns are supported
-#
-app
-dev
-index.php
-lib/internal/Magento
-pub
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 1d53a637557..7f4e36bbdbb 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
@@ -1,148 +1,9 @@
-# Files or directories that are included into static code analysis
-# Glob patterns are supported
-#
-app/bootstrap.php
-app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
-app/code/Magento/Backend/Block/System/Store/Edit
-app/code/Magento/Backend/Block/System/Store/Edit.php
-app/code/Magento/Backend/Model/Observer.php
-app/code/Magento/Bundle/Model/Plugin
-app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
-app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
-app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
-app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
-app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
-app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
-app/code/Magento/Catalog/Block/Product/TemplateSelector.php
-app/code/Magento/Catalog/Block/Product/View/BaseImage.php
-app/code/Magento/Catalog/Block/Product/View/Gallery.php
-app/code/Magento/Catalog/Block/Product/View/Tabs.php
-app/code/Magento/Catalog/Model/Attribute/Config
-app/code/Magento/Catalog/Model/Attribute/Config.php
-app/code/Magento/Catalog/Model/Resource/Category/Collection
-app/code/Magento/Catalog/Model/Product/Type.php
-app/code/Magento/Catalog/Model/ProductOptions
-app/code/Magento/Catalog/Model/ProductTypes
-app/code/Magento/Catalog/Model/Plugin
-app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
-app/code/Magento/Centinel/Model/State/Jcb.php
-app/code/Magento/Checkout/Block/Cart/Link.php
-app/code/Magento/Checkout/Block/Link.php
-app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
-app/code/Magento/Cms/Controller/Router.php
-app/code/Magento/Cms/Model/Template/FilterProvider.php
-app/code/Magento/ConfigurableImportExport
-app/code/Magento/ConfigurableProduct
-app/code/Magento/Core/data
-app/code/Magento/Core/Model/Design.php
-app/code/Magento/Core/Model/Layout/Update.php
-app/code/Magento/Core/Model/Resource/Theme
-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/Cron/Model/Config/Converter
-app/code/Magento/Cron/Model/Config/Reader
-app/code/Magento/Cron/Model/Config/Data.php
-app/code/Magento/Cron/Model/Config/SchemaLocator.php
-app/code/Magento/Cron/Model/Config.php
-app/code/Magento/Cron/Model/ConfigInterface.php
-app/code/Magento/Directory/Helper
-app/code/Magento/Customer/Block
-app/code/Magento/Customer/Controller
-app/code/Magento/Customer/Helper
-app/code/Magento/Customer/Model/Visitor.php
-app/code/Magento/Customer/Model/Resource/Visitor.php
-app/code/Magento/Customer/Model/Address/Config
-app/code/Magento/Customer/Model/Address/Config.php
-app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php
-app/code/Magento/CustomerImportExport/Model/Resource/Import/Customer/Storage.php
-app/code/Magento/CustomerImportExport/Model/Resource/Import/CustomerComposite/Data.php
-app/code/Magento/Directory/Model/Currency/DefaultLocator.php
-app/code/Magento/Directory/Model/Resource/Region
-app/code/Magento/Eav/Model/Cache/Type.php
-app/code/Magento/GiftMessage/Model/Plugin
-app/code/Magento/GiftMessage/Model/Type/Plugin
-app/code/Magento/GiftMessage/Service
-app/code/Magento/GoogleShopping/Block/SiteVerification.php
-app/code/Magento/GoogleShopping/Model/AttributeFactory.php
-app/code/Magento/GroupedImportExport
-app/code/Magento/Eav/Model/Entity/Attribute/Config
-app/code/Magento/Eav/Model/Entity/Attribute/Config.php
-app/code/Magento/Email
-app/code/Magento/ImportExport/Model/Export/Config
-app/code/Magento/ImportExport/Model/Export/Config.php
-app/code/Magento/ImportExport/Model/Export/ConfigInterface.php
-app/code/Magento/ImportExport/Model/Import/Config
-app/code/Magento/ImportExport/Model/Import/Config.php
-app/code/Magento/ImportExport/Model/Import/ConfigInterface.php
-app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
-app/code/Magento/Integration
-app/code/Magento/Log/Model/Resource/Helper.php
-app/code/Magento/Log/Model/Resource/Shell.php
-app/code/Magento/Log/Model/Shell.php
-app/code/Magento/Log/Model/Shell
-app/code/Magento/Msrp
-app/code/Magento/ProductAlert/Block/Product/View
-app/code/Magento/Reports/Block/Adminhtml/Customer
-app/code/Magento/Reports/Block/Adminhtml/Product
-app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
-app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
-app/code/Magento/Reports/Model/Plugin
-app/code/Magento/Reports/Model/Resource/Accounts
-app/code/Magento/Reports/Model/Resource/Customer
-app/code/Magento/Reports/Model/Resource/Report/Collection.php
-app/code/Magento/Sales/Block/Guest/Link.php
-app/code/Magento/Sales/Block/Order/Link.php
-app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
-app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
-app/code/Magento/Sales/Model/Order/Pdf/Config
-app/code/Magento/Sales/Model/Order/Pdf/Config.php
-app/code/Magento/Sales/Model/Order/Pdf/Total/Factory.php
-app/code/Magento/Sales/Model/Observer
-app/code/Magento/Sales/Model/Quote/Address/*Interface.php
-app/code/Magento/Sales/Model/Quote/Address/*Interface.php
-app/code/Magento/Sales/Model/Resource/Order/Rss/OrderStatus.php
-app/code/Magento/Sales/Model/Rss/NewOrder.php
-app/code/Magento/Sales/Model/Rss/OrderStatus.php
-app/code/Magento/SalesRule/Model/Plugin
-app/code/Magento/Sendfriend/Block/Plugin/Catalog/Product/View.php
-app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/Invoice.php
-app/code/Magento/Shipping/Model/Observer.php
-app/code/Magento/Shipping/Model/Order/Track.php
-app/code/Magento/Shipping/Model/CarrierFactory.php
-app/code/Magento/Shipping/Model/Resource/Order
-app/code/Magento/Theme
-app/code/Magento/Webapi
-app/code/Magento/GroupedProduct
-app/code/Magento/Rss
-app/code/Magento/CatalogUrlRewrite
-app/code/Magento/CmsUrlRewrite
-app/code/Magento/UrlRewrite
-app/code/Magento/Wishlist/Block/Link.php
-app/code/Magento/Wishlist/Block/Rss
-app/code/Magento/Wishlist/Model/Rss/Wishlist.php
-dev/shell
+app/code/Magento
+lib/internal/Magento/Framework
+dev/tools/Magento
+dev/tests/api-functional
dev/tests/functional
-dev/tests/integration/*
-dev/tests/js
+dev/tests/integration
dev/tests/performance
dev/tests/static
-dev/tests/unit/framework
-dev/tests/unit/testsuite/Magento/*
-dev/tools
-lib/internal/Magento/Framework/App
-lib/internal/Magento/Framework/Backup/Db
-lib/internal/Magento/Framework/Backup/Factory.php
-lib/internal/Magento/Framework/Cache/Core.php
-lib/internal/Magento/Framework/Convert
-lib/internal/Magento/Framework/Exception
-lib/internal/Magento/Framework/Stdlib/DateTime.php
-lib/internal/Magento/Framework/Object.php
-lib/internal/Magento/Framework/Data/Argument
-lib/internal/Magento/Framework/ObjectManager
-lib/internal/Magento/Framework/Api
-lib/internal/Magento/Framework/Url/SecurityInfoInterface.php
-lib/internal/Magento/Framework/View
-lib/internal/Magento/Framework/Locale/Validator.php
-lib/internal/Magento/Framework/Notification
+dev/tests/unit
\ No newline at end of file
--
GitLab
From 7be10014adecd88f6d1da8418c4a2e559edf2748 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Tue, 6 Jan 2015 12:23:36 -0600
Subject: [PATCH 032/120] MAGETWO-31732: Blacklisted ComposerTest
- updated composer.lock after merge
---
composer.lock | 80 ++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 64 insertions(+), 16 deletions(-)
diff --git a/composer.lock b/composer.lock
index d2fc6da7fe7..c21f6ae9496 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": "d3a510fb8a6b17c084148509d02478d4",
+ "hash": "18b11d313f169ab82027772ba8d02278",
"packages": [
{
"name": "composer/composer",
@@ -290,16 +290,16 @@
},
{
"name": "seld/jsonlint",
- "version": "1.3.0",
+ "version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35"
+ "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/a7bc2ec9520ad15382292591b617c43bdb1fec35",
- "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
+ "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4",
"shasum": ""
},
"require": {
@@ -332,7 +332,7 @@
"parser",
"validator"
],
- "time": "2014-09-05 15:36:20"
+ "time": "2015-01-04 21:18:15"
},
{
"name": "symfony/console",
@@ -2001,16 +2001,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.0.13",
+ "version": "2.0.14",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5"
+ "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
- "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca158276c1200cc27f5409a5e338486bc0b4fc94",
+ "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94",
"shasum": ""
},
"require": {
@@ -2062,7 +2062,7 @@
"testing",
"xunit"
],
- "time": "2014-12-03 06:41:44"
+ "time": "2014-12-26 13:28:33"
},
{
"name": "phpunit/php-file-iterator",
@@ -2608,16 +2608,16 @@
},
{
"name": "sebastian/version",
- "version": "1.0.3",
+ "version": "1.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
- "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
+ "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
- "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b",
+ "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b",
"shasum": ""
},
"type": "library",
@@ -2639,7 +2639,7 @@
],
"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-12-15 14:25:24"
},
{
"name": "sjparkinson/static-review",
@@ -3025,6 +3025,53 @@
"description": "Symfony Stopwatch Component",
"homepage": "http://symfony.com",
"time": "2014-12-02 20:19:20"
+ },
+ {
+ "name": "symfony/yaml",
+ "version": "v2.6.1",
+ "target-dir": "Symfony/Component/Yaml",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Yaml.git",
+ "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
+ "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\Yaml\\": ""
+ }
+ },
+ "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 Yaml Component",
+ "homepage": "http://symfony.com",
+ "time": "2014-12-02 20:19:20"
}
],
"aliases": [],
@@ -3034,6 +3081,7 @@
"phpmd/phpmd": 0
},
"prefer-stable": false,
+ "prefer-lowest": false,
"platform": {
"php": "~5.4.11|~5.5.0"
},
--
GitLab
From b1ceba97200d97a94d21e43e7c479136cd623019 Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Tue, 6 Jan 2015 15:51:44 -0600
Subject: [PATCH 033/120] MAGETWO-32364: Improve performance in pricing
framework
---
app/code/Magento/Catalog/Model/Product.php | 6 ++++--
.../Magento/Catalog/Model/ProductTest.php | 8 ++++++-
.../Pricing/Price/CollectionTest.php | 2 ++
.../Framework/Pricing/Price/Collection.php | 21 ++++++++++++++-----
4 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index b26ffe5bdcf..f23e7167cb5 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -776,8 +776,10 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
*/
public function setQty($qty)
{
- $this->setData('qty', $qty);
- $this->reloadPriceInfo();
+ if ($this->getData('qty') != $qty) {
+ $this->setData('qty', $qty);
+ $this->reloadPriceInfo();
+ }
return $this;
}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
index c94f539159a..82d7278fc0e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -423,10 +423,16 @@ class ProductTest extends \PHPUnit_Framework_TestCase
*/
public function testSetQty()
{
- $this->productTypeInstanceMock->expects($this->once())
+ $this->productTypeInstanceMock->expects($this->exactly(2))
->method('getPriceInfo')
->with($this->equalTo($this->model))
->will($this->returnValue($this->_priceInfoMock));
+
+ //initialize the priceInfo field
+ $this->model->getPriceInfo();
+ //Calling setQty will reset the priceInfo field
+ $this->assertEquals($this->model, $this->model->setQty(1));
+ //Call the setQty method with the same qty, getPriceInfo should not be called this time
$this->assertEquals($this->model, $this->model->setQty(1));
$this->assertEquals($this->model->getPriceInfo(), $this->_priceInfoMock);
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Pricing/Price/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Price/CollectionTest.php
index 518d0e8be36..eaf3fb43e90 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Pricing/Price/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Price/CollectionTest.php
@@ -79,6 +79,8 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
)
->will($this->returnValue($this->priceMock));
$this->assertEquals($this->priceMock, $this->collection->get('regular_price'));
+ //Calling the get method again with the same code, cached copy should be used
+ $this->assertEquals($this->priceMock, $this->collection->get('regular_price'));
}
/**
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Collection.php b/lib/internal/Magento/Framework/Pricing/Price/Collection.php
index ed5fc69fac3..b18fc76bb9e 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/Collection.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/Collection.php
@@ -42,6 +42,13 @@ class Collection implements \Iterator
*/
protected $excludes;
+ /**
+ * Cached price models
+ *
+ * @var array
+ */
+ protected $priceModels;
+
/**
* Constructor
*
@@ -60,6 +67,7 @@ class Collection implements \Iterator
$this->priceFactory = $priceFactory;
$this->pool = $pool;
$this->quantity = $quantity;
+ $this->priceModels = [];
}
/**
@@ -120,10 +128,13 @@ class Collection implements \Iterator
*/
public function get($code)
{
- return $this->priceFactory->create(
- $this->saleableItem,
- $this->pool[$code],
- $this->quantity
- );
+ if (!isset($this->priceModels[$code])) {
+ $this->priceModels[$code] = $this->priceFactory->create(
+ $this->saleableItem,
+ $this->pool[$code],
+ $this->quantity
+ );
+ }
+ return $this->priceModels[$code];
}
}
--
GitLab
From cf88c253e1fbc800bc9cde0e804f9869f7cd7d39 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Thu, 8 Jan 2015 15:04:55 +0200
Subject: [PATCH 034/120] MAGETWO-32079: Alternative WebDriver support
---
.../Install/Test/Block/CreateAdmin.php | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
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 2b18c9ca7a1..089a6185df9 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
@@ -6,7 +6,9 @@
namespace Magento\Install\Test\Block;
use Mtf\Block\Form;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Locator;
+use Mtf\Fixture\FixtureInterface;
/**
* Create Admin Account block.
@@ -20,6 +22,13 @@ class CreateAdmin extends Form
*/
protected $next = "[ng-click*='next']";
+ /**
+ * First field selector
+ *
+ * @var string
+ */
+ protected $firstField = '[name="adminUsername"]';
+
/**
* Click on 'Next' button.
*
@@ -29,4 +38,17 @@ class CreateAdmin extends Form
{
$this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
}
+
+ /**
+ * Ensure the form is loaded and fill the root form
+ *
+ * @param FixtureInterface $fixture
+ * @param SimpleElement|null $element
+ * @return $this
+ */
+ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
+ {
+ $this->waitForElementVisible($this->firstField);
+ return parent::fill($fixture, $element);
+ }
}
--
GitLab
From 8b47e7afde8223bef2f3194bbdbdc41af7e05f17 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Thu, 8 Jan 2015 16:56:49 +0200
Subject: [PATCH 035/120] MAGETWO-32079: Alternative WebDriver support
---
.../Install/Test/Block/CustomizeStore.php | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
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 5cb44776e60..111e1b1192d 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
@@ -6,7 +6,9 @@
namespace Magento\Install\Test\Block;
use Mtf\Block\Form;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Client\Locator;
+use Mtf\Fixture\FixtureInterface;
/**
* Customize Your Store block.
@@ -20,6 +22,13 @@ class CustomizeStore extends Form
*/
protected $next = "[ng-click*='next']";
+ /**
+ * First field selector
+ *
+ * @var string
+ */
+ protected $firstField = '[ng-model*="language"]';
+
/**
* Click on 'Next' button.
*
@@ -29,4 +38,17 @@ class CustomizeStore extends Form
{
$this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
}
+
+ /**
+ * Ensure the form is loaded and fill the root form
+ *
+ * @param FixtureInterface $fixture
+ * @param SimpleElement|null $element
+ * @return $this
+ */
+ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
+ {
+ $this->waitForElementVisible($this->firstField);
+ return parent::fill($fixture, $element);
+ }
}
--
GitLab
From a9916e6fb3601b8fd2c6b985749f878893787693 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Thu, 8 Jan 2015 18:41:34 +0200
Subject: [PATCH 036/120] MAGETWO-32079: Alternative WebDriver support
---
.../Install/Test/Constraint/AssertRewritesEnabled.php | 6 +++---
.../Install/Test/Constraint/AssertSecureUrlEnabled.php | 6 +++---
2 files changed, 6 insertions(+), 6 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 c9db0e7d4a2..69083b7cdb9 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
@@ -7,7 +7,7 @@ namespace Magento\Install\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Mtf\Constraint\AbstractConstraint;
-use Mtf\Client\Driver\Selenium\Browser;
+use Mtf\Client\BrowserInterface;
use Magento\Catalog\Test\Fixture\CatalogCategory;
/**
@@ -24,9 +24,9 @@ class AssertRewritesEnabled extends AbstractConstraint
*
* @param CatalogCategory $category
* @param CmsIndex $homePage
- * @param Browser $browser
+ * @param BrowserInterface $browser
*/
- public function processAssert(CatalogCategory $category, CmsIndex $homePage, Browser $browser)
+ public function processAssert(CatalogCategory $category, CmsIndex $homePage, BrowserInterface $browser)
{
$category->persist();
$homePage->open();
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 2397ad0103e..a2cd0aea65c 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
@@ -5,7 +5,7 @@
namespace Magento\Install\Test\Constraint;
-use Mtf\Client\Browser;
+use Mtf\Client\BrowserInterface;
use Mtf\Constraint\AbstractConstraint;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
use Magento\Customer\Test\Page\CustomerAccountLogin;
@@ -22,13 +22,13 @@ class AssertSecureUrlEnabled extends AbstractConstraint
/**
* Assert that Secure Urls Enabled.
*
- * @param Browser $browser
+ * @param BrowserInterface $browser
* @param Dashboard $dashboard
* @param CustomerAccountLogin $customerAccountLogin
* @return void
*/
public function processAssert(
- Browser $browser,
+ BrowserInterface $browser,
Dashboard $dashboard,
CustomerAccountLogin $customerAccountLogin
) {
--
GitLab
From cc5a21566d26ae4ceecfbf01a7cbc344bb44dc17 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Fri, 9 Jan 2015 16:30:08 +0200
Subject: [PATCH 037/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- Downloadable goup price fix and tax bug skip MAGETWO-18521
---
.../DownloadableProductInjectable/GroupPriceOptions.php | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
index ef1024f4013..374f9be0460 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
@@ -19,6 +19,13 @@ class GroupPriceOptions extends \Magento\Catalog\Test\Fixture\CatalogProductSimp
protected function getPreset($name)
{
$presets = [
+ 'default' => [
+ [
+ 'price' => 20,
+ 'website' => 'All Websites [USD]',
+ 'customer_group' => 'NOT LOGGED IN',
+ ],
+ ],
'downloadable_with_tax' => [
[
'price' => 20.00,
--
GitLab
From 819015cc492b8e943cf05bb776d132a3b41e399b Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Fri, 9 Jan 2015 09:40:24 -0600
Subject: [PATCH 038/120] MAGETWO-30415: [GITHUB]
\Magento\Framework\Pricing\PriceCurrencyInterface depends on Magento
application code #682
---
app/code/Magento/Directory/Model/PriceCurrency.php | 8 +-------
.../Magento/Framework/Pricing/PriceCurrencyInterface.php | 6 +++---
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 3cc16e54ca6..77e8410eb02 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -57,13 +57,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
}
/**
- * Convert and round price value for specified store or passed currency
- *
- * @param float $amount
- * @param null|string|bool|int|\Magento\Store\Model\Store $store
- * @param Currency|string|null $currency
- * @param int $precision
- * @return float
+ * {@inheritdoc}
*/
public function convertAndRound($amount, $store = null, $currency = null, $precision = self::DEFAULT_PRECISION)
{
diff --git a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
index a1ec1dde8cf..1347dd006c2 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
@@ -29,12 +29,12 @@ interface PriceCurrencyInterface
* Convert and round price value
*
* @param float $amount
- * @param null|string|bool|int|\Magento\Store\Model\Store $store
- * @param \Magento\Directory\Model\Currency|string|null $currency
+ * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
+ * @param \Magento\Framework\Model\AbstractModel|string|null $currency
* @param int $precision
* @return float
*/
- public function convertAndRound($amount, $store = null, $currency = null, $precision = self::DEFAULT_PRECISION);
+ public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION);
/**
* Format price value
--
GitLab
From 238860fe779434a07de63c141d673e204c6fafb8 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 9 Jan 2015 18:34:25 +0200
Subject: [PATCH 039/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- make tests to work with several files with changes
---
.../TestFramework/Utility/ChangedFiles.php | 9 +++++++-
.../Magento/Test/Legacy/ObsoleteCodeTest.php | 2 +-
.../Magento/Test/Php/LiveCodeTest.php | 23 +++++++++++--------
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php b/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
index 12f30777c88..2bb78abdba7 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
@@ -5,6 +5,8 @@
namespace Magento\TestFramework\Utility;
+use Magento\Framework\Test\Utility\Files;
+
/**
* A helper to gather various changed files
* if INCREMENTAL_BUILD env variable is set by CI build infrastructure, only files changed in the
@@ -23,7 +25,12 @@ class ChangedFiles
$fileHelper = \Magento\Framework\Test\Utility\Files::init();
$allPhpFiles = $fileHelper->getPhpFiles();
if (isset($_ENV['INCREMENTAL_BUILD'])) {
- $phpFiles = file($changedFilesList, FILE_IGNORE_NEW_LINES);
+ try {
+ $phpFiles = Files::readLists($changedFilesList);
+ } catch (\Exception $e){
+ $phpFiles = [];
+ }
+
foreach ($phpFiles as $key => $phpFile) {
$phpFiles[$key] = $fileHelper->getPathToSource() . '/' . $phpFile;
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index d70d167aec5..5409481f3bd 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -129,7 +129,7 @@ class ObsoleteCodeTest extends \PHPUnit_Framework_TestCase
$this->_testObsoleteConstants($content);
$this->_testObsoletePropertySkipCalculate($content);
},
- \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files.txt')
+ \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files')
);
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index cf45282b97a..bdace23da6a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -52,17 +52,22 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
{
$directoriesToCheck = file(__DIR__ . '/_files/whitelist/whitelist.txt', FILE_IGNORE_NEW_LINES);
- $changedFiles = array_filter(
- Utility\Files::readLists(__DIR__ . '/_files/changed_files.txt'),
- function ($path) use ($directoriesToCheck) {
- foreach ($directoriesToCheck as $directory) {
- if (strpos($path, BP . '/' . $directory) === 0) {
- return true;
+ try {
+ $changedFiles = array_filter(
+ Utility\Files::readLists(__DIR__ . '/_files/changed_files'),
+ function ($path) use ($directoriesToCheck) {
+ foreach ($directoriesToCheck as $directory) {
+ if (strpos($path, BP . '/' . $directory) === 0) {
+ return true;
+ }
}
+ return false;
}
- return false;
- }
- );
+ );
+ } catch (\Exception $e) {
+ $changedFiles = [];
+ }
+
if (!empty($fileTypes)) {
$changedFiles = array_filter(
$changedFiles,
--
GitLab
From 67adf6bde988192d1828668b410e037d6c161b2b Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 9 Jan 2015 18:38:57 +0200
Subject: [PATCH 040/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- added whitelist
---
dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index bdace23da6a..42bf38ba1c0 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -50,7 +50,7 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
*/
public static function getWhitelist($fileTypes = ['php'])
{
- $directoriesToCheck = file(__DIR__ . '/_files/whitelist/whitelist.txt', FILE_IGNORE_NEW_LINES);
+ $directoriesToCheck = file(__DIR__ . '/_files/whitelist/common.txt', FILE_IGNORE_NEW_LINES);
try {
$changedFiles = array_filter(
--
GitLab
From fc0095909cc60285af2ba08318316b1322360bb3 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 9 Jan 2015 18:44:05 +0200
Subject: [PATCH 041/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- removed dataprovider
---
dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 42bf38ba1c0..7638669ece1 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -159,11 +159,9 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
/**
* Run mess detector on code
*
- * @param array $whiteList
* @return void
- * @dataProvider whiteListDataProvider
*/
- public function testCodeMess($whiteList)
+ public function testCodeMess()
{
$reportFile = self::$reportDir . '/phpmd_report.xml';
$codeMessDetector = new CodeMessDetector(realpath(__DIR__ . '/_files/phpmd/ruleset.xml'), $reportFile);
--
GitLab
From b7cde0221cb8a7ccd49775c94433249e5f2d1d4d Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Fri, 9 Jan 2015 15:10:37 -0600
Subject: [PATCH 042/120] MAGETWO-30415: [GITHUB]
\Magento\Framework\Pricing\PriceCurrencyInterface depends on Magento
application code #682
- Change parameter name in implementation class to be consistent with interface
---
app/code/Magento/Directory/Model/PriceCurrency.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 77e8410eb02..e30e2059b39 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -59,10 +59,10 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
/**
* {@inheritdoc}
*/
- public function convertAndRound($amount, $store = null, $currency = null, $precision = self::DEFAULT_PRECISION)
+ public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
{
- $currentCurrency = $this->getCurrency($store, $currency);
- $convertedValue = $this->getStore($store)->getBaseCurrency()->convert($amount, $currentCurrency);
+ $currentCurrency = $this->getCurrency($scope, $currency);
+ $convertedValue = $this->getStore($scope)->getBaseCurrency()->convert($amount, $currentCurrency);
return round($convertedValue, $precision);
}
--
GitLab
From ddd3d6976cf3f018cd960db35e5ef659f265a1e9 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Mon, 12 Jan 2015 11:14:54 +0200
Subject: [PATCH 043/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- CR fixes
---
.../app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php | 5 +----
.../Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php | 6 +++---
.../AbstractAssertTaxCalculationAfterCheckout.php | 4 ++--
.../AbstractAssertTaxRuleIsAppliedToAllPrices.php | 6 +++---
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index 98d5718ae0f..a5ebf67d371 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.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\Sales\Test\Block\Adminhtml\Order;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
index b7c81790948..982a52c8bff 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -46,7 +46,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
protected $severeness = 'high';
/**
- * Implementation assert
+ * Implementation for get order total prices function
*
* @param array $actualPrices
* @return array
@@ -54,7 +54,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
abstract protected function getOrderTotals($actualPrices);
/**
- * Implementation assert
+ * Implementation for get invoice creation page total prices function
*
* @param array $actualPrices
* @return array
@@ -62,7 +62,7 @@ abstract class AbstractAssertOrderTaxOnBackend extends AbstractConstraint
abstract protected function getInvoiceNewTotals($actualPrices);
/**
- * Implementation getCreditMemoNewTotals
+ * Implementation for get credit memo creation page total prices function
*
* @param array $actualPrices
* @return array
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
index 51c7b44bf0b..097b0873f8d 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -40,7 +40,7 @@ abstract class AbstractAssertTaxCalculationAfterCheckout extends AbstractConstra
protected $severeness = 'high';
/**
- * Implementation getReviewTotals
+ * Implementation for get order review total prices function
*
* @param array $actualPrices
* @return array
@@ -48,7 +48,7 @@ abstract class AbstractAssertTaxCalculationAfterCheckout extends AbstractConstra
abstract protected function getReviewTotals($actualPrices);
/**
- * Implementation getOrderTotals
+ * Implementation for get order total prices from customer account function
*
* @param array $actualPrices
* @return array
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
index 52cb287f119..d1fc1751b3b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
@@ -55,7 +55,7 @@ abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstra
protected $severeness = 'high';
/**
- * Implementation getCategoryPrices
+ * Implementation for get category prices function
*
* @param string $productName
* @param array $actualPrices
@@ -64,7 +64,7 @@ abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstra
abstract protected function getCategoryPrices($productName, $actualPrices);
/**
- * Implementation getProductPagePrices
+ * Implementation for get product page prices function
*
* @param array $actualPrices
* @return array
@@ -72,7 +72,7 @@ abstract class AbstractAssertTaxRuleIsAppliedToAllPrices extends AbstractConstra
abstract protected function getProductPagePrices($actualPrices);
/**
- * Implementation getTotals
+ * Implementation for get totals in cart function
*
* @param array $actualPrices
* @return array
--
GitLab
From 3cbac1dc04dd35e6480077da1dbc951a94cff1c6 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Mon, 12 Jan 2015 19:51:18 +0200
Subject: [PATCH 044/120] MAGETWO-32592: MTF Alternative Web Driver pull
request preparation
---
.../Mtf/Client/Element/ConditionsElement.php | 24 ++++++++-----------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
index 17fe72704a2..33acb079b79 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
@@ -83,7 +83,7 @@ class ConditionsElement extends SimpleElement
*
* @var string
*/
- protected $created = './/preceding-sibling::li[1]';
+ protected $created = './ul/li[1]';
/**
* Children condition
@@ -97,7 +97,7 @@ class ConditionsElement extends SimpleElement
*
* @var string
*/
- protected $param = './span[@class="rule-param"]/span/*[substring(@id,(string-length(@id)-%d+1))="%s"]/../..';
+ protected $param = './span[span[*[substring(@id,(string-length(@id)-%d+1))="%s"]]]';
/**
* Key of last find param
@@ -194,9 +194,9 @@ class ConditionsElement extends SimpleElement
$newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
$typeNewCondition = $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select');
$typeNewCondition->setValue($condition['type']);
- $this->ruleParamWait();
- $createdCondition = $newCondition->find($this->created, Locator::SELECTOR_XPATH);
+ $createdCondition = $context->find($this->created, Locator::SELECTOR_XPATH);
+ $this->waitForCondition($createdCondition);
if (!empty($condition['rules'])) {
$this->fillCondition($condition['rules'], $createdCondition);
}
@@ -243,9 +243,8 @@ class ConditionsElement extends SimpleElement
}
);
$newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select')->setValue($condition['type']);
- $this->ruleParamWait();
-
- $createdCondition = $newCondition->find($this->created, Locator::SELECTOR_XPATH);
+ $createdCondition = $context->find($this->created, Locator::SELECTOR_XPATH);
+ $this->waitForCondition($createdCondition);
$this->fillCondition($condition['rules'], $createdCondition);
}
@@ -387,14 +386,11 @@ class ConditionsElement extends SimpleElement
*
* @return void
*/
- protected function ruleParamWait()
+ protected function waitForCondition(SimpleElement $element)
{
- $browser = $this;
- $ruleParamWait = $this->ruleParamWait;
- $browser->waitUntil(
- function () use ($browser, $ruleParamWait) {
- $element = $browser->find($ruleParamWait, Locator::SELECTOR_XPATH);
- return $element->isVisible() ? null : true;
+ $this->waitUntil(
+ function () use ($element) {
+ return $element->getAttribute('class') == 'rule-param-wait' ? null : true;
}
);
}
--
GitLab
From 505b6e16902197d7c181f170a9141d29873c8dc4 Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Mon, 12 Jan 2015 15:40:26 -0600
Subject: [PATCH 045/120] MAGETWO-32448:Move Emulation class to
Magento/Store/Model/App/Emulation
---
app/code/Magento/Email/Model/AbstractTemplate.php | 6 +++---
app/code/Magento/Email/Model/BackendTemplate.php | 4 ++--
app/code/Magento/Email/Model/Template.php | 4 ++--
app/code/Magento/Newsletter/Model/Queue.php | 4 ++--
app/code/Magento/Newsletter/Model/Template.php | 4 ++--
app/code/Magento/Payment/Helper/Data.php | 6 +++---
app/code/Magento/ProductAlert/Model/Email.php | 6 +++---
app/code/Magento/{Core => Store}/Model/App/Emulation.php | 5 +++--
.../testsuite/Magento/Core/Model/App/EmulationTest.php | 8 ++++----
.../testsuite/Magento/Email/Model/TemplateTest.php | 2 +-
.../Magento/Test/Legacy/_files/obsolete_classes.php | 1 +
.../testsuite/Magento/Core/Model/App/EmulationTest.php | 6 +++---
.../unit/testsuite/Magento/Email/Model/TemplateTest.php | 2 +-
.../testsuite/Magento/Newsletter/Model/TemplateTest.php | 2 +-
.../unit/testsuite/Magento/Payment/Helper/DataTest.php | 2 +-
15 files changed, 32 insertions(+), 30 deletions(-)
rename app/code/Magento/{Core => Store}/Model/App/Emulation.php (98%)
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index ca38c73e7c6..dbc58086db9 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -56,7 +56,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
protected $_design = null;
/**
- * @var \Magento\Core\Model\App\Emulation
+ * @var \Magento\Store\Model\App\Emulation
*/
protected $_appEmulation;
@@ -69,7 +69,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Core\Model\App\Emulation $appEmulation
+ * @param \Magento\Store\Model\App\Emulation $appEmulation
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
*/
@@ -77,7 +77,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
\Magento\Framework\Model\Context $context,
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
- \Magento\Core\Model\App\Emulation $appEmulation,
+ \Magento\Store\Model\App\Emulation $appEmulation,
\Magento\Store\Model\StoreManagerInterface $storeManager,
array $data = []
) {
diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php
index abc963099c9..27c6084b438 100644
--- a/app/code/Magento/Email/Model/BackendTemplate.php
+++ b/app/code/Magento/Email/Model/BackendTemplate.php
@@ -21,7 +21,7 @@ class BackendTemplate extends Template
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Core\Model\App\Emulation $appEmulation
+ * @param \Magento\Store\Model\App\Emulation $appEmulation
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Asset\Repository $assetRepo
@@ -38,7 +38,7 @@ class BackendTemplate extends Template
\Magento\Framework\Model\Context $context,
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
- \Magento\Core\Model\App\Emulation $appEmulation,
+ \Magento\Store\Model\App\Emulation $appEmulation,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\View\Asset\Repository $assetRepo,
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
index a397317ff4c..e3b52978ca6 100644
--- a/app/code/Magento/Email/Model/Template.php
+++ b/app/code/Magento/Email/Model/Template.php
@@ -157,7 +157,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Core\Model\App\Emulation $appEmulation
+ * @param \Magento\Store\Model\App\Emulation $appEmulation
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Asset\Repository $assetRepo
@@ -173,7 +173,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento
\Magento\Framework\Model\Context $context,
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
- \Magento\Core\Model\App\Emulation $appEmulation,
+ \Magento\Store\Model\App\Emulation $appEmulation,
StoreManagerInterface $storeManager,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\View\Asset\Repository $assetRepo,
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
index cb84858cfff..85b50fa153d 100644
--- a/app/code/Magento/Newsletter/Model/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Queue.php
@@ -114,7 +114,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Core\Model\App\Emulation $appEmulation
+ * @param \Magento\Store\Model\App\Emulation $appEmulation
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Newsletter\Model\Template\Filter $templateFilter
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -129,7 +129,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
\Magento\Framework\Model\Context $context,
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
- \Magento\Core\Model\App\Emulation $appEmulation,
+ \Magento\Store\Model\App\Emulation $appEmulation,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Newsletter\Model\Template\Filter $templateFilter,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
index ddb12607ece..46f0270e193 100644
--- a/app/code/Magento/Newsletter/Model/Template.php
+++ b/app/code/Magento/Newsletter/Model/Template.php
@@ -93,7 +93,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Core\Model\App\Emulation $appEmulation
+ * @param \Magento\Store\Model\App\Emulation $appEmulation
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Newsletter\Model\Template\Filter $filter
@@ -106,7 +106,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
\Magento\Framework\Model\Context $context,
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
- \Magento\Core\Model\App\Emulation $appEmulation,
+ \Magento\Store\Model\App\Emulation $appEmulation,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\RequestInterface $request,
\Magento\Newsletter\Model\Template\Filter $filter,
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 057619e94bb..e27a93a3a5c 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -52,7 +52,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* App emulation model
*
- * @var \Magento\Core\Model\App\Emulation
+ * @var \Magento\Store\Model\App\Emulation
*/
protected $_appEmulation;
@@ -68,7 +68,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param LayoutFactory $layoutFactory
* @param \Magento\Payment\Model\Method\Factory $paymentMethodFactory
- * @param \Magento\Core\Model\App\Emulation $appEmulation
+ * @param \Magento\Store\Model\App\Emulation $appEmulation
* @param \Magento\Payment\Model\Config $paymentConfig
* @param \Magento\Framework\App\Config\Initial $initialConfig
*/
@@ -77,7 +77,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
LayoutFactory $layoutFactory,
\Magento\Payment\Model\Method\Factory $paymentMethodFactory,
- \Magento\Core\Model\App\Emulation $appEmulation,
+ \Magento\Store\Model\App\Emulation $appEmulation,
\Magento\Payment\Model\Config $paymentConfig,
\Magento\Framework\App\Config\Initial $initialConfig
) {
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index a7ef2815887..a1e3bb59e3a 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -92,7 +92,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
protected $customerRepository;
/**
- * @var \Magento\Core\Model\App\Emulation
+ * @var \Magento\Store\Model\App\Emulation
*/
protected $_appEmulation;
@@ -114,7 +114,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param \Magento\Customer\Helper\View $customerHelper
- * @param \Magento\Core\Model\App\Emulation $appEmulation
+ * @param \Magento\Store\Model\App\Emulation $appEmulation
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -128,7 +128,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
\Magento\Customer\Helper\View $customerHelper,
- \Magento\Core\Model\App\Emulation $appEmulation,
+ \Magento\Store\Model\App\Emulation $appEmulation,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Core/Model/App/Emulation.php b/app/code/Magento/Store/Model/App/Emulation.php
similarity index 98%
rename from app/code/Magento/Core/Model/App/Emulation.php
rename to app/code/Magento/Store/Model/App/Emulation.php
index 85f57ad6170..5b64511218a 100644
--- a/app/code/Magento/Core/Model/App/Emulation.php
+++ b/app/code/Magento/Store/Model/App/Emulation.php
@@ -9,8 +9,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Core\Model\App;
+namespace Magento\Store\Model\App;
+use Magento\Framework\Object;
use Magento\Framework\Translate\Inline\ConfigInterface;
class Emulation extends \Magento\Framework\Object
@@ -145,7 +146,7 @@ class Emulation extends \Magento\Framework\Object
*
* Function restores initial store environment
*
- * @return \Magento\Core\Model\App\Emulation
+ * @return \Magento\Store\Model\App\Emulation
*/
public function stopEnvironmentEmulation()
{
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
index 6bd0071e940..17e06017fc7 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
@@ -8,18 +8,18 @@ namespace Magento\Core\Model\App;
class EmulationTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\App\Emulation
+ * @var \Magento\Store\Model\App\Emulation
*/
protected $_model;
/**
- * @covers \Magento\Core\Model\App\Emulation::startEnvironmentEmulation
- * @covers \Magento\Core\Model\App\Emulation::stopEnvironmentEmulation
+ * @covers \Magento\Store\Model\App\Emulation::startEnvironmentEmulation
+ * @covers \Magento\Store\Model\App\Emulation::stopEnvironmentEmulation
*/
public function testEnvironmentEmulation()
{
$this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\App\Emulation');
+ ->create('Magento\Store\Model\App\Emulation');
\Magento\TestFramework\Helper\Bootstrap::getInstance()
->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
$design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index 3344852fa45..a1f054261ad 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -34,7 +34,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
$objectManager->get('Magento\Framework\Model\Context'),
$objectManager->get('Magento\Framework\View\DesignInterface'),
$objectManager->get('Magento\Framework\Registry'),
- $objectManager->get('Magento\Core\Model\App\Emulation'),
+ $objectManager->get('Magento\Store\Model\App\Emulation'),
$objectManager->get('Magento\Store\Model\StoreManager'),
$objectManager->create('Magento\Framework\Filesystem'),
$objectManager->create('Magento\Framework\View\Asset\Repository'),
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 553c41e4a1d..0e5649cf5d6 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
@@ -1302,6 +1302,7 @@ return [
['Magento\Core\Controller\Varien\DispatchableInterface'],
['Magento\Core\Controller\Varien\Front', 'Magento\Framework\App\FrontController'],
['Magento\Core\Controller\FrontInterface', 'Magento\Framework\App\FrontControllerInterface'],
+ ['Magento\Core\Model\App\Emulation', 'Magento\Store\Model\App\Emulation'],
['Magento\Core\Model\App\Handler'],
['Magento\Core\Model\App\Proxy'],
['Magento\Core\Model\Event\Config\SchemaLocator', 'Magento\Framework\Event\Config\SchemaLocator'],
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
index b7e79200421..fd6cb10592a 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
@@ -1,6 +1,6 @@
<?php
/**
- * Tests Magento\Core\Model\App\Emulation
+ * Tests Magento\Store\Model\App\Emulation
*
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
@@ -65,7 +65,7 @@ class EmulationTest extends \PHPUnit_Framework_TestCase
const NEW_STORE_ID = 9;
/**
- * @var \Magento\Core\Model\App\Emulation
+ * @var \Magento\Store\Model\App\Emulation
*/
private $model;
@@ -105,7 +105,7 @@ class EmulationTest extends \PHPUnit_Framework_TestCase
$this->designMock->expects($this->any())->method('getData')->willReturn(false);
// Prepare SUT
- $this->model = $this->objectManager->getObject('Magento\Core\Model\App\Emulation',
+ $this->model = $this->objectManager->getObject('Magento\Store\Model\App\Emulation',
[
'storeManager' => $this->storeManagerMock,
'viewDesign' => $this->viewDesignMock,
diff --git a/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
index 7ff2358c4f2..f63b91e5ea6 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Model/TemplateTest.php
@@ -30,7 +30,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
$this->getMock('Magento\Framework\Model\Context', [], [], '', false),
$this->getMock('Magento\Core\Model\View\Design', [], [], '', false),
$this->getMock('Magento\Framework\Registry', [], [], '', false),
- $this->getMock('Magento\Core\Model\App\Emulation', [], [], '', false),
+ $this->getMock('Magento\Store\Model\App\Emulation', [], [], '', false),
$this->getMock('Magento\Store\Model\StoreManager', [], [], '', false),
$this->getMock('Magento\Framework\Filesystem', [], [], '', false),
$this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false),
diff --git a/dev/tests/unit/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/unit/testsuite/Magento/Newsletter/Model/TemplateTest.php
index 34ae088e892..853ddae4c01 100644
--- a/dev/tests/unit/testsuite/Magento/Newsletter/Model/TemplateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -40,7 +40,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
}
$filter = $this->getMock('Magento\Newsletter\Model\Template\Filter', [], [], '', false);
- $appEmulation = $this->getMock('Magento\Core\Model\App\Emulation', [], [], '', false);
+ $appEmulation = $this->getMock('Magento\Store\Model\App\Emulation', [], [], '', false);
$filter->expects($this->once())->method('setStoreId')->with('test_id');
$filter->expects($this->once())->method('setIncludeProcessor')->will($this->returnSelf());
$filter->expects(
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php
index f2ae8359ac8..0c3371787ec 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php
@@ -42,7 +42,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
$layoutFactoryMock->expects($this->once())->method('create')->willReturn($this->layoutMock);
$this->methodFactory = $this->getMock('Magento\Payment\Model\Method\Factory', [], [], '', false);
- $this->appEmulation = $this->getMock('Magento\Core\Model\App\Emulation', [], [], '', false);
+ $this->appEmulation = $this->getMock('Magento\Store\Model\App\Emulation', [], [], '', false);
$paymentConfig = $this->getMock('Magento\Payment\Model\Config', [], [], '', false);
$this->initialConfig = $this->getMock('Magento\Framework\App\Config\Initial', [], [], '', false);
--
GitLab
From df06832afb5f011ba1c9e6e0c79376ab11856286 Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Mon, 12 Jan 2015 15:48:24 -0600
Subject: [PATCH 046/120] MAGETWO-32450: Move Factory to
Magento/Framework/Validator
---
app/code/Magento/Customer/Model/Resource/Address.php | 6 +++---
app/code/Magento/Customer/Model/Resource/Customer.php | 6 +++---
.../Magento/Core/Model/Validator/FactoryTest.php | 6 +++---
.../Magento/Test/Legacy/_files/obsolete_properties.php | 2 +-
.../Magento/Core/Model/Validator/FactoryTest.php | 8 ++++----
.../Magento/Customer/Model/Resource/AddressTest.php | 4 ++--
.../internal/Magento/Framework}/Validator/Factory.php | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
rename {app/code/Magento/Core/Model => lib/internal/Magento/Framework}/Validator/Factory.php (98%)
diff --git a/app/code/Magento/Customer/Model/Resource/Address.php b/app/code/Magento/Customer/Model/Resource/Address.php
index bec7eec4634..c047a54d3ee 100644
--- a/app/code/Magento/Customer/Model/Resource/Address.php
+++ b/app/code/Magento/Customer/Model/Resource/Address.php
@@ -12,7 +12,7 @@ use Magento\Framework\Exception\InputException;
class Address extends \Magento\Eav\Model\Entity\AbstractEntity
{
/**
- * @var \Magento\Core\Model\Validator\Factory
+ * @var \Magento\Framework\Validator\Factory
*/
protected $_validatorFactory;
@@ -28,7 +28,7 @@ class Address extends \Magento\Eav\Model\Entity\AbstractEntity
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Core\Model\Validator\Factory $validatorFactory
+ * @param \Magento\Framework\Validator\Factory $validatorFactory
* @param \Magento\Customer\Model\CustomerFactory $customerFactory
* @param array $data
*/
@@ -39,7 +39,7 @@ class Address extends \Magento\Eav\Model\Entity\AbstractEntity
\Magento\Framework\Locale\FormatInterface $localeFormat,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Core\Model\Validator\Factory $validatorFactory,
+ \Magento\Framework\Validator\Factory $validatorFactory,
\Magento\Customer\Model\CustomerFactory $customerFactory,
$data = []
) {
diff --git a/app/code/Magento/Customer/Model/Resource/Customer.php b/app/code/Magento/Customer/Model/Resource/Customer.php
index f7874f48d97..323fe78a199 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer.php
@@ -13,7 +13,7 @@ use Magento\Framework\Exception\InputException;
class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
{
/**
- * @var \Magento\Core\Model\Validator\Factory
+ * @var \Magento\Framework\Validator\Factory
*/
protected $_validatorFactory;
@@ -37,7 +37,7 @@ class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Core\Model\Validator\Factory $validatorFactory
+ * @param \Magento\Framework\Validator\Factory $validatorFactory
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param array $data
*/
@@ -49,7 +49,7 @@ class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Core\Model\Validator\Factory $validatorFactory,
+ \Magento\Framework\Validator\Factory $validatorFactory,
\Magento\Framework\Stdlib\DateTime $dateTime,
$data = []
) {
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
index eeaaba1172a..ada0959e9ca 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
@@ -1,6 +1,6 @@
<?php
/**
- * Integration test for \Magento\Core\Model\Validator\Factory
+ * Integration test for \Magento\Framework\Validator\Factory
*
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
@@ -17,8 +17,8 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
public function testGetValidatorConfig()
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- /** @var \Magento\Core\Model\Validator\Factory $factory */
- $factory = $objectManager->get('Magento\Core\Model\Validator\Factory');
+ /** @var \Magento\Framework\Validator\Factory $factory */
+ $factory = $objectManager->get('Magento\Framework\Validator\Factory');
$this->assertInstanceOf('Magento\Framework\Validator\Config', $factory->getValidatorConfig());
// Check that default translator was set
$translator = \Magento\Framework\Validator\AbstractValidator::getDefaultTranslator();
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
index c16cc293b23..d145bd51182 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -290,7 +290,7 @@ return [
['_storeManager', 'Magento\Translation\Model\Resource\String'],
['_isVdeRequest', 'Magento\DesignEditor\Helper\Data'],
['_translator', 'Magento\Framework\Phrase\Renderer\Translate', 'translator'],
- ['_translator', 'Magento\Core\Model\Validator\Factory'],
+ ['_translator', 'Magento\Framework\Validator\Factory'],
['_configFactory', 'Magento\Core\Model\App\Emulation', 'inlineConfig'],
['_scopeConfig', 'Magento\Translation\Model\Inline\Config', 'config'],
['_translate', 'Magento\Directory\Model\Observer'],
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
index 2ad8b19d563..3fe0da1f3e4 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
@@ -1,6 +1,6 @@
<?php
/**
- * Unit test for \Magento\Core\Model\Validator\Factory
+ * Unit test for \Magento\Framework\Validator\Factory
*
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
@@ -104,7 +104,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testGetValidatorConfig()
{
- $factory = new \Magento\Core\Model\Validator\Factory(
+ $factory = new \Magento\Framework\Validator\Factory(
$this->_objectManager,
$this->_config,
$this->_translateAdapter
@@ -144,7 +144,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
$objectManager->getObject('Magento\Framework\Validator\Builder', ['constraints' => []])
)
);
- $factory = new \Magento\Core\Model\Validator\Factory(
+ $factory = new \Magento\Framework\Validator\Factory(
$this->_objectManager,
$this->_config,
$this->_translateAdapter
@@ -171,7 +171,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
)->will(
$this->returnValue(new \Magento\Framework\Validator())
);
- $factory = new \Magento\Core\Model\Validator\Factory(
+ $factory = new \Magento\Framework\Validator\Factory(
$this->_objectManager,
$this->_config,
$this->_translateAdapter
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php
index f87981471b7..ef3eadbebd0 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php
@@ -230,7 +230,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
/**
* Prepare validator mock object
*
- * @return \Magento\Core\Model\Validator\Factory|\PHPUnit_Framework_MockObject_MockObject
+ * @return \Magento\Framework\Validator\Factory|\PHPUnit_Framework_MockObject_MockObject
*/
protected function prepareValidatorFactory()
{
@@ -240,7 +240,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
->willReturn(true);
$validatorFactory = $this->getMock(
- 'Magento\Core\Model\Validator\Factory',
+ 'Magento\Framework\Validator\Factory',
['createValidator'],
[],
'',
diff --git a/app/code/Magento/Core/Model/Validator/Factory.php b/lib/internal/Magento/Framework/Validator/Factory.php
similarity index 98%
rename from app/code/Magento/Core/Model/Validator/Factory.php
rename to lib/internal/Magento/Framework/Validator/Factory.php
index 87417f739e0..42a9960c9de 100644
--- a/app/code/Magento/Core/Model/Validator/Factory.php
+++ b/lib/internal/Magento/Framework/Validator/Factory.php
@@ -5,7 +5,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Validator;
+namespace Magento\Framework\Validator;
class Factory
{
--
GitLab
From 520de217df0b3809cf973ab3e6b7b416389778fd Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Mon, 12 Jan 2015 15:59:43 -0600
Subject: [PATCH 047/120] MAGETWO-32452: Move Factory Integration and Unit test
to corresponding directory
---
.../Magento/{Core/Model => Framework}/Validator/FactoryTest.php | 2 +-
.../Magento/{Core/Model => Framework}/Validator/FactoryTest.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename dev/tests/integration/testsuite/Magento/{Core/Model => Framework}/Validator/FactoryTest.php (96%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => Framework}/Validator/FactoryTest.php (99%)
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php b/dev/tests/integration/testsuite/Magento/Framework/Validator/FactoryTest.php
similarity index 96%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
rename to dev/tests/integration/testsuite/Magento/Framework/Validator/FactoryTest.php
index ada0959e9ca..2a25d44f2b6 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Validator/FactoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Validator/FactoryTest.php
@@ -5,7 +5,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Validator;
+namespace Magento\Framework\Validator;
class FactoryTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Validator/FactoryTest.php
similarity index 99%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/Validator/FactoryTest.php
index 3fe0da1f3e4..649ad967473 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Validator/FactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Validator/FactoryTest.php
@@ -5,7 +5,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Validator;
+namespace Magento\Framework\Validator;
class FactoryTest extends \PHPUnit_Framework_TestCase
{
--
GitLab
From 7a4bb3dd79cb2815bff0514f39e1043a665d0859 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 13 Jan 2015 12:37:50 +0200
Subject: [PATCH 048/120] MAGETWO-32592: MTF Alternative Web Driver pull
request preparation
---
dev/tests/functional/composer.json | 4 +++-
dev/tests/functional/phpunit.xml.dist | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index a3d361ec3ff..eb54174666d 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -4,7 +4,9 @@
"php": ">=5.4.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
- "netwing/selenium-server-standalone": ">=2.35",
+ "netwing/selenium-server-standalone": ">=2.35"
+ },
+ "suggest": {
"facebook/webdriver": "dev-master"
},
"autoload": {
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index 8ee0c67c184..fddc9236ff7 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -36,6 +36,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="basic" />
<env name="log_directory" value="var/log" />
<env name="events_preset" value="base" />
--
GitLab
From 0b38c851e0af7c9c237dcd7ed1fa44f872399803 Mon Sep 17 00:00:00 2001
From: Iryna Savchenko <isavchenko@ebay.com>
Date: Tue, 13 Jan 2015 17:12:09 +0200
Subject: [PATCH 049/120] MAGETWO-30795: Optimization of
CollectTotalsFailedItems
---
app/code/Magento/Checkout/Controller/Cart/Index.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 32d273a31fa..fd43f5df96b 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -14,6 +14,7 @@ class Index extends \Magento\Checkout\Controller\Cart
*/
public function execute()
{
+ $this->_eventManager->dispatch('collect_totals_failed_items');
if ($this->cart->getQuote()->getItemsCount()) {
$this->cart->init();
$this->cart->save();
--
GitLab
From b1a682dd8c5ce32d3166f21966b04181fdced670 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Tue, 13 Jan 2015 17:20:49 +0200
Subject: [PATCH 050/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- ObsoleteCodeTest and LiveCodeTest optimized
---
.../TestFramework/Utility/ChangedFiles.php | 17 +++++---------
.../Magento/Test/Legacy/ObsoleteCodeTest.php | 2 +-
.../Magento/Test/Php/LiveCodeTest.php | 22 ++++++++-----------
.../Magento/Framework/Test/Utility/Files.php | 2 +-
4 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php b/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
index 2bb78abdba7..c2e1b911fa4 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
@@ -23,21 +23,14 @@ class ChangedFiles
public static function getPhpFiles($changedFilesList)
{
$fileHelper = \Magento\Framework\Test\Utility\Files::init();
- $allPhpFiles = $fileHelper->getPhpFiles();
if (isset($_ENV['INCREMENTAL_BUILD'])) {
- try {
- $phpFiles = Files::readLists($changedFilesList);
- } catch (\Exception $e){
- $phpFiles = [];
+ $phpFiles = Files::readLists($changedFilesList);
+ if (!empty($phpFiles)) {
+ $phpFiles = \Magento\Framework\Test\Utility\Files::composeDataSets($phpFiles);
+ $phpFiles = array_intersect_key($phpFiles, $fileHelper->getPhpFiles());
}
-
- foreach ($phpFiles as $key => $phpFile) {
- $phpFiles[$key] = $fileHelper->getPathToSource() . '/' . $phpFile;
- }
- $phpFiles = \Magento\Framework\Test\Utility\Files::composeDataSets($phpFiles);
- $phpFiles = array_intersect_key($phpFiles, $allPhpFiles);
} else {
- $phpFiles = $allPhpFiles;
+ $phpFiles = $fileHelper->getPhpFiles();
}
return $phpFiles;
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index 5409481f3bd..6ea7b09b0ec 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -129,7 +129,7 @@ class ObsoleteCodeTest extends \PHPUnit_Framework_TestCase
$this->_testObsoleteConstants($content);
$this->_testObsoletePropertySkipCalculate($content);
},
- \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files')
+ \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files*')
);
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 7638669ece1..e87c0716f88 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -52,21 +52,17 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
{
$directoriesToCheck = file(__DIR__ . '/_files/whitelist/common.txt', FILE_IGNORE_NEW_LINES);
- try {
- $changedFiles = array_filter(
- Utility\Files::readLists(__DIR__ . '/_files/changed_files'),
- function ($path) use ($directoriesToCheck) {
- foreach ($directoriesToCheck as $directory) {
- if (strpos($path, BP . '/' . $directory) === 0) {
- return true;
- }
+ $changedFiles = array_filter(
+ Utility\Files::readLists(__DIR__ . '/_files/changed_files*'),
+ function ($path) use ($directoriesToCheck) {
+ foreach ($directoriesToCheck as $directory) {
+ if (strpos($path, BP . '/' . $directory) === 0) {
+ return true;
}
- return false;
}
- );
- } catch (\Exception $e) {
- $changedFiles = [];
- }
+ return false;
+ }
+ );
if (!empty($fileTypes)) {
$changedFiles = array_filter(
diff --git a/lib/internal/Magento/Framework/Test/Utility/Files.php b/lib/internal/Magento/Framework/Test/Utility/Files.php
index becc11b1899..3f485a91abb 100644
--- a/lib/internal/Magento/Framework/Test/Utility/Files.php
+++ b/lib/internal/Magento/Framework/Test/Utility/Files.php
@@ -1068,7 +1068,7 @@ class Files
*/
$files = glob(self::init()->getPathToSource() . '/' . $pattern, GLOB_BRACE);
if (empty($files)) {
- throw new \Exception("The glob() pattern '{$pattern}' didn't return any result.");
+ continue;
}
$result = array_merge($result, $files);
}
--
GitLab
From aafcad78a48f37c5433193b4045c43e45307ea6b Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Tue, 13 Jan 2015 09:21:34 -0600
Subject: [PATCH 051/120] MAGETWO-32449: Move Emulation Tests class to
Magento/Store/Model/App/
---
.../Magento/{Core => Store}/Model/App/EmulationTest.php | 2 +-
.../Magento/{Core => Store}/Model/App/EmulationTest.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename dev/tests/integration/testsuite/Magento/{Core => Store}/Model/App/EmulationTest.php (96%)
rename dev/tests/unit/testsuite/Magento/{Core => Store}/Model/App/EmulationTest.php (99%)
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/App/EmulationTest.php
similarity index 96%
rename from dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
rename to dev/tests/integration/testsuite/Magento/Store/Model/App/EmulationTest.php
index 17e06017fc7..d374b8cea90 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/App/EmulationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/App/EmulationTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\App;
+namespace Magento\Store\Model\App;
class EmulationTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
similarity index 99%
rename from dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
rename to dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
index fd6cb10592a..d09271bdfd3 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
@@ -5,7 +5,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\App;
+namespace Magento\Store\Model\App;
class EmulationTest extends \PHPUnit_Framework_TestCase
{
--
GitLab
From fc9a6967b437a8e71530833fb347b76b4a13818e Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Tue, 13 Jan 2015 13:30:06 -0600
Subject: [PATCH 052/120] MAGETWO-32450: Move Factory to
Magento/Framework/Validator
---
.../testsuite/Magento/Test/Legacy/_files/obsolete_classes.php | 1 +
.../Magento/Test/Legacy/_files/obsolete_properties.php | 2 +-
2 files changed, 2 insertions(+), 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 553c41e4a1d..91a8d3fecb3 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
@@ -2845,4 +2845,5 @@ return [
['Magento\Framework\App\Cache\State\Options', 'Magento\Framework\App\Cache\State'],
['Magento\Framework\App\Cache\State\OptionsInterface', 'Magento\Framework\App\Cache\State'],
['Magento\Framework\Logger', 'Psr\Log\LoggerInterface'],
+ ['Magento\Core\Model\Validator\Factory', 'Magento\Framework\Validator\Factory'],
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
index d145bd51182..c16cc293b23 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -290,7 +290,7 @@ return [
['_storeManager', 'Magento\Translation\Model\Resource\String'],
['_isVdeRequest', 'Magento\DesignEditor\Helper\Data'],
['_translator', 'Magento\Framework\Phrase\Renderer\Translate', 'translator'],
- ['_translator', 'Magento\Framework\Validator\Factory'],
+ ['_translator', 'Magento\Core\Model\Validator\Factory'],
['_configFactory', 'Magento\Core\Model\App\Emulation', 'inlineConfig'],
['_scopeConfig', 'Magento\Translation\Model\Inline\Config', 'config'],
['_translate', 'Magento\Directory\Model\Observer'],
--
GitLab
From b9b410cc7f8f6e35a3995886e8aadd8f16a2241b Mon Sep 17 00:00:00 2001
From: jonathanvaughn <jvaughn@creatuity.com>
Date: Tue, 13 Jan 2015 14:19:38 -0600
Subject: [PATCH 053/120] Improving documentation for jMeter performance tests
---
dev/tools/performance-toolkit/README.txt | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/dev/tools/performance-toolkit/README.txt b/dev/tools/performance-toolkit/README.txt
index f4bf6427b5f..1316b3bff3e 100644
--- a/dev/tools/performance-toolkit/README.txt
+++ b/dev/tools/performance-toolkit/README.txt
@@ -4,16 +4,24 @@ Performance Toolkit
Installation
-----------
jMeter:
--- go to http://jmeter.apache.org/download_jmeter.cgi and download jMeter in Source section (pay you attention that Java 6 or later is required)
+-- go to http://jmeter.apache.org/download_jmeter.cgi and download jMeter in Binary section (pay you attention that Java 6 or later is required)
-- unzip archive
Plugins (only if you want to use additional reports (like graphs)):
-- go to http://jmeter-plugins.org/downloads/all/ and download JMeterPlugins-Standard and JMeterPlugins-Extras
-- unzip them to appropriate ext directory of your jMeter instance.
+-- additional reports can now be enabled via GUI (right click them, then click Enable) or editing the jMeter JMX XML (set 'enabled="true"').
Usage
-----------
+Before running the jMeter tests for the first time, you will need to first use generate.php to generate the test data.
+
+If you do not wish to use performance metrics gathered from the server(s) (such as CPU / IO load), or do not wish to configure the jMeter metric gathering software on your server(s), you can disable that either via the GUI (right click on "Performance Metrics Collector" and click Disable) or by editing the jMeter JMX XML from:
+<kg.apc.jmeter.perfmon.PerfMonCollector guiclass="kg.apc.jmeter.vizualizers.PerfMonGui" testclass="kg.apc.jmeter.perfmon.PerfMonCollector" testname="Performance Metrics Collector" enabled="true">
+to:
+<kg.apc.jmeter.perfmon.PerfMonCollector guiclass="kg.apc.jmeter.vizualizers.PerfMonGui" testclass="kg.apc.jmeter.perfmon.PerfMonCollector" testname="Performance Metrics Collector" enabled="false">
+Attempting to run with Performance Metrics Collector enabled without appropriately configuring it will result in a timeout error connecting to the collector and the test not running.
1. Run via console
Scenario can accept 5 parameters that are described bellow in format <parameter_name:default_value>:
@@ -24,6 +32,9 @@ Scenario can accept 5 parameters that are described bellow in format <parameter_
<ramp_period:300> Ramp period (seconds). Period the request will be distributed within.
<orders:0> Number of orders in the period specified in the current allocation. If <orders> is specified, the <users> parameter will be recalculated.
<report_save_path:./> Path where reports will be saved. Reports will be saved in current working directory by default.
+<admin_path:backend/> Admin backend path. Default is backend.
+<admin_user:admin/> Admin backend user. Default is admin.
+<admin_password:123123q/> Admin backend password. Default is 123123q.
All parameters must be passed to command line with "J" prefix: "-J<parameter_name>=<parameter_value>"
--
GitLab
From d192d09899a94bc3533ad9527a57e2be942125f6 Mon Sep 17 00:00:00 2001
From: jonathanvaughn <jvaughn@creatuity.com>
Date: Tue, 13 Jan 2015 14:31:05 -0600
Subject: [PATCH 054/120] Improving documentation for jMeter performance tests
---
dev/tools/performance-toolkit/README.txt | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/dev/tools/performance-toolkit/README.txt b/dev/tools/performance-toolkit/README.txt
index 1316b3bff3e..0a94b4e4b38 100644
--- a/dev/tools/performance-toolkit/README.txt
+++ b/dev/tools/performance-toolkit/README.txt
@@ -24,7 +24,7 @@ to:
Attempting to run with Performance Metrics Collector enabled without appropriately configuring it will result in a timeout error connecting to the collector and the test not running.
1. Run via console
-Scenario can accept 5 parameters that are described bellow in format <parameter_name:default_value>:
+Scenario can accept parameters that are described bellow in format <parameter_name:default_value>:
<host:''> URL component 'host' of application being tested (URL or IP).
<base_path:'/'> Base path for tested site.
@@ -35,6 +35,15 @@ Scenario can accept 5 parameters that are described bellow in format <parameter_
<admin_path:backend/> Admin backend path. Default is backend.
<admin_user:admin/> Admin backend user. Default is admin.
<admin_password:123123q/> Admin backend password. Default is 123123q.
+<view_product_add_to_cart_percent:62/> Percentage of users that will only reach the add to cart stage. Default is 62.
+<view_catalog_percent:30/> Percentage of users that will only reach the view catalog stage. Default is 30.
+<guest_checkout_percent:4/> Percentage of users that will reach the guest checkout stage. Default is 4.
+<customer_checkout_percent:4/> Percentage of users that will reach the (logged-in) customer checkout stage. Default is 4.
+<loops:1/> Number of loops to run. Default is 1.
+<jmeter_agent_port:3450/> jMeter agent port. Default is 3450.
+<db_server_ip:10.62.51.150/> DB Server IP (for jMeter Performance Metrics). Default is 10.62.51.150.
+<web_server_1_ip:10.62.51.185/> Web Server 1 IP (for jMeter Performance Metrics). Default is 10.62.51.185.
+<web_server_2_ip:10.62.51.186/> Web Server 2 IP (for jMeter Performance Metrics). Default is 10.62.51.186.
All parameters must be passed to command line with "J" prefix: "-J<parameter_name>=<parameter_value>"
--
GitLab
From 004c9bb917b250ae2d6515ec3b96d4099b6f9c2e Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 14 Jan 2015 14:46:18 +0200
Subject: [PATCH 055/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- ignore coding standards added to files with defects
---
.../AdminNotification/Block/Grid/Renderer/Actions.php | 3 +++
app/code/Magento/AdminNotification/Block/ToolbarEntry.php | 3 +++
.../AdminNotification/Model/Resource/Grid/Collection.php | 2 ++
.../AdminNotification/Model/System/Message/Baseurl.php | 3 +++
.../Model/System/Message/Media/Synchronization/Error.php | 3 +++
.../AdminNotification/Model/System/Message/Security.php | 3 +++
.../view/adminhtml/templates/notification/window.phtml | 3 +++
.../view/adminhtml/templates/system/messages.phtml | 3 +++
.../view/adminhtml/templates/system/messages/popup.phtml | 3 +++
.../view/adminhtml/templates/toolbar_entry.phtml | 3 +++
app/code/Magento/Authorization/Model/Resource/Rules.php | 3 +++
app/code/Magento/Backend/App/Config.php | 3 +++
app/code/Magento/Backend/Block/Dashboard.php | 3 +++
.../Magento/Backend/Block/Dashboard/AbstractDashboard.php | 3 +++
app/code/Magento/Backend/Block/Menu.php | 3 +++
app/code/Magento/Backend/Block/Page/Header.php | 3 +++
app/code/Magento/Backend/Block/Page/Notices.php | 2 ++
.../Backend/Block/Page/System/Config/Robots/Reset.php | 3 +++
.../Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php | 3 +++
app/code/Magento/Backend/Block/System/Config/Form/Field.php | 2 ++
.../Config/Form/Field/FieldArray/AbstractFieldArray.php | 3 +++
.../Block/System/Config/Form/Field/Select/Allowspecific.php | 2 ++
.../Magento/Backend/Block/System/Design/Edit/Tab/General.php | 3 +++
.../Magento/Backend/Block/Widget/Form/Element/Gallery.php | 3 +++
.../Magento/Backend/Block/Widget/Form/Renderer/Element.php | 3 +++
.../Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php | 3 +++
.../Backend/Block/Widget/Form/Renderer/Fieldset/Element.php | 3 +++
app/code/Magento/Backend/Block/Widget/Grid.php | 3 +++
.../Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php | 3 +++
.../Backend/Block/Widget/Grid/Column/Filter/Datetime.php | 3 +++
.../Backend/Block/Widget/Grid/Column/Renderer/Action.php | 3 +++
.../Backend/Block/Widget/Grid/Column/Renderer/Currency.php | 3 +++
app/code/Magento/Backend/Block/Widget/Grid/Export.php | 3 +++
.../Magento/Backend/Controller/Adminhtml/System/Store.php | 3 +++
.../Magento/Backend/Model/Config/Backend/Currency/Base.php | 2 ++
.../Magento/Backend/Model/Config/Backend/Email/Sender.php | 2 ++
app/code/Magento/Backend/Model/Config/Backend/Encrypted.php | 3 +++
.../Magento/Backend/Model/Config/Source/Dev/Dbautoup.php | 3 +++
.../Magento/Backend/Model/Config/Structure/Element/Group.php | 3 +++
app/code/Magento/Backend/Model/Menu/Director/Director.php | 3 +++
app/code/Magento/Backend/Model/Menu/Item.php | 3 +++
.../Magento/Backend/Model/Widget/Grid/AbstractTotals.php | 3 +++
.../view/adminhtml/templates/admin/access_denied.phtml | 3 +++
.../Backend/view/adminhtml/templates/admin/login.phtml | 3 +++
.../view/adminhtml/templates/admin/overlay_popup.phtml | 3 +++
.../Backend/view/adminhtml/templates/admin/page.phtml | 3 +++
.../Backend/view/adminhtml/templates/dashboard/graph.phtml | 3 +++
.../Backend/view/adminhtml/templates/dashboard/grid.phtml | 3 +++
.../Backend/view/adminhtml/templates/dashboard/index.phtml | 3 +++
.../Backend/view/adminhtml/templates/dashboard/salebar.phtml | 3 +++
.../view/adminhtml/templates/dashboard/searches.phtml | 3 +++
.../view/adminhtml/templates/dashboard/store/switcher.phtml | 3 +++
.../view/adminhtml/templates/dashboard/totalbar.phtml | 3 +++
app/code/Magento/Backend/view/adminhtml/templates/menu.phtml | 3 +++
.../Backend/view/adminhtml/templates/page/copyright.phtml | 3 +++
.../Backend/view/adminhtml/templates/page/footer.phtml | 3 +++
.../Backend/view/adminhtml/templates/page/header.phtml | 2 ++
.../view/adminhtml/templates/page/js/components.phtml | 3 +++
.../Backend/view/adminhtml/templates/page/js/translate.phtml | 3 +++
.../Backend/view/adminhtml/templates/page/locale.phtml | 3 +++
.../Backend/view/adminhtml/templates/page/notices.phtml | 3 +++
.../templates/page/system/config/robots/reset.phtml | 2 ++
.../Backend/view/adminhtml/templates/pageactions.phtml | 3 +++
.../Backend/view/adminhtml/templates/store/switcher.phtml | 3 +++
.../templates/store/switcher/form/renderer/fieldset.phtml | 3 +++
.../store/switcher/form/renderer/fieldset/element.phtml | 3 +++
.../view/adminhtml/templates/system/autocomplete.phtml | 3 +++
.../Backend/view/adminhtml/templates/system/cache/edit.phtml | 3 +++
.../view/adminhtml/templates/system/config/edit.phtml | 3 +++
.../adminhtml/templates/system/config/form/field/array.phtml | 3 +++
.../Backend/view/adminhtml/templates/system/config/js.phtml | 3 +++
.../view/adminhtml/templates/system/config/switcher.phtml | 3 +++
.../system/config/system/storage/media/synchronize.phtml | 3 +++
.../view/adminhtml/templates/system/config/tabs.phtml | 2 ++
.../view/adminhtml/templates/system/design/index.phtml | 3 +++
.../Backend/view/adminhtml/templates/system/search.phtml | 2 ++
.../Backend/view/adminhtml/templates/widget/accordion.phtml | 3 +++
.../view/adminhtml/templates/widget/breadcrumbs.phtml | 3 +++
.../Backend/view/adminhtml/templates/widget/button.phtml | 3 +++
.../view/adminhtml/templates/widget/button/split.phtml | 3 +++
.../Backend/view/adminhtml/templates/widget/form.phtml | 3 +++
.../view/adminhtml/templates/widget/form/container.phtml | 3 +++
.../view/adminhtml/templates/widget/form/element.phtml | 3 +++
.../adminhtml/templates/widget/form/element/gallery.phtml | 3 +++
.../adminhtml/templates/widget/form/renderer/element.phtml | 3 +++
.../adminhtml/templates/widget/form/renderer/fieldset.phtml | 3 +++
.../templates/widget/form/renderer/fieldset/element.phtml | 3 +++
.../Backend/view/adminhtml/templates/widget/grid.phtml | 3 +++
.../view/adminhtml/templates/widget/grid/column_set.phtml | 3 +++
.../view/adminhtml/templates/widget/grid/container.phtml | 3 +++
.../adminhtml/templates/widget/grid/container/empty.phtml | 3 +++
.../view/adminhtml/templates/widget/grid/export.phtml | 3 +++
.../view/adminhtml/templates/widget/grid/extended.phtml | 3 +++
.../view/adminhtml/templates/widget/grid/massaction.phtml | 3 +++
.../templates/widget/grid/massaction_extended.phtml | 3 +++
.../view/adminhtml/templates/widget/grid/serializer.phtml | 3 +++
.../Backend/view/adminhtml/templates/widget/tabs.phtml | 2 ++
.../Backend/view/adminhtml/templates/widget/tabshoriz.phtml | 3 +++
.../Backend/view/adminhtml/templates/widget/tabsleft.phtml | 3 +++
.../view/adminhtml/templates/widget/view/container.phtml | 3 +++
.../Backend/view/install/templates/page/copyright.phtml | 3 +++
app/code/Magento/Backup/Model/Resource/Helper.php | 3 +++
.../Backup/view/adminhtml/templates/backup/dialogs.phtml | 3 +++
.../Backup/view/adminhtml/templates/backup/list.phtml | 3 +++
.../Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php | 3 +++
.../Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php | 3 +++
app/code/Magento/Bundle/Model/Product/Type.php | 3 +++
.../Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php | 3 +++
.../product/composite/fieldset/options/bundle.phtml | 3 +++
.../product/composite/fieldset/options/type/checkbox.phtml | 2 ++
.../product/composite/fieldset/options/type/multi.phtml | 2 ++
.../product/composite/fieldset/options/type/radio.phtml | 2 ++
.../product/composite/fieldset/options/type/select.phtml | 2 ++
.../view/adminhtml/templates/product/edit/bundle.phtml | 2 ++
.../adminhtml/templates/product/edit/bundle/option.phtml | 2 ++
.../templates/product/edit/bundle/option/selection.phtml | 2 ++
.../templates/sales/creditmemo/create/items/renderer.phtml | 3 +++
.../templates/sales/creditmemo/view/items/renderer.phtml | 3 +++
.../templates/sales/invoice/create/items/renderer.phtml | 3 +++
.../templates/sales/invoice/view/items/renderer.phtml | 3 +++
.../templates/sales/order/view/items/renderer.phtml | 3 +++
.../templates/sales/shipment/create/items/renderer.phtml | 3 +++
.../templates/sales/shipment/view/items/renderer.phtml | 3 +++
.../view/base/templates/product/price/final_price.phtml | 3 +++
.../view/base/templates/product/price/selection/amount.phtml | 3 +++
.../view/base/templates/product/price/tier_prices.phtml | 3 +++
.../frontend/templates/catalog/product/view/customize.phtml | 3 +++
.../frontend/templates/catalog/product/view/summary.phtml | 3 +++
.../templates/catalog/product/view/type/bundle.phtml | 4 +++-
.../catalog/product/view/type/bundle/option/checkbox.phtml | 3 +++
.../catalog/product/view/type/bundle/option/multi.phtml | 2 ++
.../catalog/product/view/type/bundle/option/radio.phtml | 2 ++
.../catalog/product/view/type/bundle/option/select.phtml | 3 +++
.../templates/catalog/product/view/type/bundle/options.phtml | 3 +++
.../templates/email/order/items/creditmemo/default.phtml | 3 +++
.../templates/email/order/items/invoice/default.phtml | 3 +++
.../frontend/templates/email/order/items/order/default.phtml | 3 +++
.../templates/email/order/items/shipment/default.phtml | 3 +++
.../Bundle/view/frontend/templates/js/components.phtml | 3 +++
.../templates/sales/order/creditmemo/items/renderer.phtml | 3 +++
.../templates/sales/order/invoice/items/renderer.phtml | 3 +++
.../view/frontend/templates/sales/order/items/renderer.phtml | 2 ++
.../templates/sales/order/shipment/items/renderer.phtml | 3 +++
app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php | 2 ++
.../Magento/Captcha/view/adminhtml/templates/default.phtml | 3 +++
.../Magento/Captcha/view/frontend/templates/default.phtml | 3 +++
.../Captcha/view/frontend/templates/js/components.phtml | 3 +++
app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php | 2 ++
.../Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php | 2 ++
.../Product/Edit/Action/Attribute/Tab/Attributes.php | 2 ++
.../Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php | 2 ++
.../Block/Adminhtml/Product/Edit/Tab/Options/Option.php | 2 ++
.../Catalog/Block/Adminhtml/Product/Helper/Form/Category.php | 3 +++
.../Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php | 2 ++
app/code/Magento/Catalog/Block/Breadcrumbs.php | 2 ++
app/code/Magento/Catalog/Block/Navigation.php | 3 +++
.../Magento/Catalog/Block/Product/ProductList/Related.php | 3 +++
.../Magento/Catalog/Block/Product/ProductList/Upsell.php | 3 +++
.../Controller/Adminhtml/Product/Action/Attribute.php | 3 +++
.../Catalog/Controller/Adminhtml/Product/Attribute/Save.php | 3 +++
app/code/Magento/Catalog/Helper/Product/ProductList.php | 2 ++
app/code/Magento/Catalog/Helper/Product/View.php | 2 ++
app/code/Magento/Catalog/Model/Config.php | 3 +++
app/code/Magento/Catalog/Model/Factory.php | 2 ++
.../Catalog/Model/Indexer/Category/Flat/AbstractAction.php | 3 +++
.../Model/Indexer/Category/Product/AbstractAction.php | 3 +++
.../Model/Indexer/Category/Product/Plugin/IndexerState.php | 3 +++
.../Model/Indexer/Category/Product/Plugin/MviewState.php | 3 +++
.../Catalog/Model/Indexer/Product/Flat/Plugin/Store.php | 3 +++
.../Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php | 3 +++
.../Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php | 3 +++
app/code/Magento/Catalog/Model/Layer/Filter/Item.php | 2 ++
app/code/Magento/Catalog/Model/Layer/Filter/Price.php | 3 +++
app/code/Magento/Catalog/Model/Product/Action.php | 3 +++
.../Attribute/Backend/Groupprice/AbstractGroupprice.php | 3 +++
.../Magento/Catalog/Model/Product/Attribute/Backend/Sku.php | 2 ++
.../Catalog/Model/Product/Attribute/Source/Inputtype.php | 2 ++
app/code/Magento/Catalog/Model/Product/Media/Config.php | 3 +++
app/code/Magento/Catalog/Model/Product/Option.php | 3 +++
.../Catalog/Model/Product/Option/Type/DefaultType.php | 3 +++
app/code/Magento/Catalog/Model/Product/Option/Value.php | 3 +++
.../Magento/Catalog/Model/Product/TypeTransitionManager.php | 3 +++
app/code/Magento/Catalog/Model/Product/Website.php | 2 ++
app/code/Magento/Catalog/Model/Resource/AbstractResource.php | 3 +++
app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php | 3 +++
.../Model/Resource/Product/Attribute/Backend/Media.php | 3 +++
.../Magento/Catalog/Model/Resource/Product/Collection.php | 3 +++
app/code/Magento/Catalog/Model/Template/Filter.php | 2 ++
app/code/Magento/Catalog/Model/Template/Filter/Factory.php | 2 ++
app/code/Magento/Catalog/Pricing/Price/TierPrice.php | 2 ++
.../Catalog/data/catalog_setup/data-install-2.0.0.php | 2 ++
.../templates/catalog/category/checkboxes/tree.phtml | 3 +++
.../view/adminhtml/templates/catalog/category/edit.phtml | 3 +++
.../adminhtml/templates/catalog/category/edit/form.phtml | 2 ++
.../view/adminhtml/templates/catalog/category/tree.phtml | 3 +++
.../adminhtml/templates/catalog/category/widget/tree.phtml | 3 +++
.../templates/catalog/form/renderer/fieldset/element.phtml | 3 +++
.../Catalog/view/adminhtml/templates/catalog/product.phtml | 3 +++
.../adminhtml/templates/catalog/product/attribute/form.phtml | 3 +++
.../adminhtml/templates/catalog/product/attribute/js.phtml | 3 +++
.../templates/catalog/product/attribute/labels.phtml | 3 +++
.../templates/catalog/product/attribute/options.phtml | 3 +++
.../templates/catalog/product/attribute/set/main.phtml | 3 +++
.../catalog/product/attribute/set/toolbar/main.phtml | 3 +++
.../templates/catalog/product/composite/configure.phtml | 3 +++
.../catalog/product/composite/fieldset/options.phtml | 3 +++
.../product/composite/fieldset/options/type/date.phtml | 3 +++
.../product/composite/fieldset/options/type/file.phtml | 3 +++
.../product/composite/fieldset/options/type/select.phtml | 3 +++
.../product/composite/fieldset/options/type/text.phtml | 3 +++
.../templates/catalog/product/composite/fieldset/qty.phtml | 3 +++
.../view/adminhtml/templates/catalog/product/edit.phtml | 3 +++
.../templates/catalog/product/edit/action/attribute.phtml | 3 +++
.../templates/catalog/product/edit/action/inventory.phtml | 3 +++
.../templates/catalog/product/edit/action/websites.phtml | 3 +++
.../templates/catalog/product/edit/attribute_set.phtml | 3 +++
.../adminhtml/templates/catalog/product/edit/options.phtml | 3 +++
.../templates/catalog/product/edit/options/option.phtml | 3 +++
.../templates/catalog/product/edit/options/type/date.phtml | 3 +++
.../templates/catalog/product/edit/options/type/file.phtml | 3 +++
.../templates/catalog/product/edit/options/type/select.phtml | 3 +++
.../templates/catalog/product/edit/options/type/text.phtml | 3 +++
.../templates/catalog/product/edit/price/group.phtml | 3 +++
.../templates/catalog/product/edit/price/tier.phtml | 3 +++
.../templates/catalog/product/edit/serializer.phtml | 3 +++
.../adminhtml/templates/catalog/product/edit/websites.phtml | 3 +++
.../adminhtml/templates/catalog/product/helper/gallery.phtml | 3 +++
.../view/adminhtml/templates/catalog/product/js.phtml | 2 ++
.../view/adminhtml/templates/catalog/product/tab/alert.phtml | 3 +++
.../adminhtml/templates/catalog/product/tab/inventory.phtml | 3 +++
.../view/adminhtml/templates/catalog/wysiwyg/js.phtml | 3 +++
.../adminhtml/templates/product/edit/attribute/search.phtml | 2 ++
.../Catalog/view/adminhtml/templates/product/edit/tabs.phtml | 2 ++
.../templates/product/grid/massaction_extended.phtml | 3 +++
.../Catalog/view/adminhtml/templates/rss/grid/link.phtml | 2 ++
.../view/base/templates/product/price/amount/default.phtml | 3 +++
.../view/base/templates/product/price/amount/option.phtml | 3 +++
.../Catalog/view/base/templates/product/price/default.phtml | 3 +++
.../view/base/templates/product/price/final_price.phtml | 3 +++
.../view/base/templates/product/price/tier_prices.phtml | 3 +++
.../Catalog/view/frontend/templates/category/cms.phtml | 3 +++
.../view/frontend/templates/category/description.phtml | 3 +++
.../Catalog/view/frontend/templates/category/image.phtml | 3 +++
.../Catalog/view/frontend/templates/category/products.phtml | 3 +++
.../Catalog/view/frontend/templates/category/rss.phtml | 3 +++
.../Catalog/view/frontend/templates/category/view.phtml | 3 +++
.../Catalog/view/frontend/templates/js/components.phtml | 3 +++
.../Catalog/view/frontend/templates/navigation/left.phtml | 2 ++
.../view/frontend/templates/product/compare/link.phtml | 3 +++
.../view/frontend/templates/product/compare/list.phtml | 3 +++
.../view/frontend/templates/product/compare/sidebar.phtml | 3 +++
.../Catalog/view/frontend/templates/product/gallery.phtml | 3 +++
.../Catalog/view/frontend/templates/product/list.phtml | 3 +++
.../Catalog/view/frontend/templates/product/list/items.phtml | 3 +++
.../view/frontend/templates/product/list/toolbar.phtml | 3 +++
.../frontend/templates/product/list/toolbar/amount.phtml | 3 +++
.../frontend/templates/product/list/toolbar/limiter.phtml | 3 +++
.../frontend/templates/product/list/toolbar/sorter.phtml | 3 +++
.../frontend/templates/product/list/toolbar/viewmode.phtml | 3 +++
.../Catalog/view/frontend/templates/product/listing.phtml | 3 +++
.../view/frontend/templates/product/view/additional.phtml | 3 +++
.../Catalog/view/frontend/templates/product/view/addto.phtml | 3 +++
.../view/frontend/templates/product/view/addtocart.phtml | 2 ++
.../view/frontend/templates/product/view/attribute.phtml | 2 ++
.../view/frontend/templates/product/view/attributes.phtml | 2 ++
.../view/frontend/templates/product/view/base-image.phtml | 2 ++
.../view/frontend/templates/product/view/description.phtml | 2 ++
.../view/frontend/templates/product/view/details.phtml | 3 +++
.../Catalog/view/frontend/templates/product/view/form.phtml | 2 ++
.../view/frontend/templates/product/view/mailto.phtml | 3 +++
.../frontend/templates/product/view/opengraph/general.phtml | 2 ++
.../view/frontend/templates/product/view/options.phtml | 3 +++
.../frontend/templates/product/view/options/type/date.phtml | 3 +++
.../templates/product/view/options/type/default.phtml | 3 +++
.../frontend/templates/product/view/options/type/file.phtml | 3 +++
.../templates/product/view/options/type/select.phtml | 3 +++
.../frontend/templates/product/view/options/type/text.phtml | 3 +++
.../view/frontend/templates/product/view/price_clone.phtml | 3 +++
.../view/frontend/templates/product/view/review.phtml | 3 +++
.../view/frontend/templates/product/view/type/default.phtml | 3 +++
.../product/widget/new/column/new_default_list.phtml | 3 +++
.../product/widget/new/column/new_images_list.phtml | 3 +++
.../templates/product/widget/new/column/new_names_list.phtml | 3 +++
.../templates/product/widget/new/content/new_grid.phtml | 3 +++
.../templates/product/widget/new/content/new_list.phtml | 3 +++
.../Magento/CatalogImportExport/Model/Import/Product.php | 3 +++
.../CatalogImportExport/Model/Import/Product/Option.php | 3 +++
.../Model/Indexer/Category/Product/Plugin/Import.php | 3 +++
.../Model/Indexer/Product/Category/Plugin/Import.php | 3 +++
.../Model/Resource/Stock/Item/StockItemCriteria.php | 3 +++
.../Model/Resource/Stock/Status/StockStatusCriteria.php | 3 +++
app/code/Magento/CatalogInventory/Model/StockIndex.php | 3 +++
.../Magento/CatalogInventory/Model/StockStateProvider.php | 3 +++
.../view/frontend/templates/qtyincrements.phtml | 2 ++
.../view/frontend/templates/stockqty/composite.phtml | 2 ++
.../view/frontend/templates/stockqty/default.phtml | 2 ++
.../CatalogRule/Controller/Adminhtml/Promo/Catalog.php | 2 ++
.../view/adminhtml/templates/promo/fieldset.phtml | 3 +++
.../CatalogRule/view/adminhtml/templates/promo/form.phtml | 3 +++
.../CatalogSearch/Model/Resource/Search/Collection.php | 3 +++
.../view/frontend/templates/advanced/form.phtml | 3 +++
.../view/frontend/templates/advanced/link.phtml | 3 +++
.../view/frontend/templates/advanced/result.phtml | 3 +++
.../CatalogSearch/view/frontend/templates/result.phtml | 3 +++
.../Magento/CatalogWidget/Block/Product/ProductsList.php | 3 +++
.../view/adminhtml/templates/product/widget/conditions.phtml | 3 +++
.../frontend/templates/product/widget/content/grid.phtml | 3 +++
app/code/Magento/Centinel/Model/Config.php | 2 ++
.../view/adminhtml/templates/authentication/complete.phtml | 3 +++
.../Centinel/view/adminhtml/templates/validation/form.phtml | 3 +++
.../Centinel/view/frontend/templates/authentication.phtml | 3 +++
.../view/frontend/templates/authentication/complete.phtml | 3 +++
app/code/Magento/Centinel/view/frontend/templates/logo.phtml | 3 +++
app/code/Magento/Checkout/Block/Cart/Item/Renderer.php | 3 +++
app/code/Magento/Checkout/Block/Cart/Sidebar.php | 3 +++
app/code/Magento/Checkout/Block/Cart/Sidebar/Totals.php | 3 +++
app/code/Magento/Checkout/Block/Onepage/Failure.php | 3 +++
app/code/Magento/Checkout/Block/Onepage/Progress.php | 3 +++
app/code/Magento/Checkout/Controller/Cart/Add.php | 3 +++
app/code/Magento/Checkout/Controller/Cart/Index.php | 3 +++
.../Magento/Checkout/Controller/Cart/UpdateItemOptions.php | 3 +++
app/code/Magento/Checkout/Controller/Cart/UpdatePost.php | 3 +++
app/code/Magento/Checkout/Helper/Cart.php | 3 +++
app/code/Magento/Checkout/Service/V1/Cart/WriteService.php | 2 ++
app/code/Magento/Checkout/Service/V1/Data/Cart.php | 3 +++
.../Checkout/Service/V1/PaymentMethod/WriteService.php | 3 +++
.../Service/V1/PaymentMethod/WriteServiceInterface.php | 3 +++
.../Checkout/Service/V1/ShippingMethod/ReadService.php | 2 ++
.../Checkout/Service/V1/ShippingMethod/WriteService.php | 3 +++
.../Service/V1/ShippingMethod/WriteServiceInterface.php | 3 +++
.../Magento/Checkout/view/frontend/templates/button.phtml | 3 +++
.../view/frontend/templates/cart/additional/info.phtml | 3 +++
.../Checkout/view/frontend/templates/cart/coupon.phtml | 3 +++
.../Magento/Checkout/view/frontend/templates/cart/form.phtml | 2 ++
.../frontend/templates/cart/item/configure/updatecart.phtml | 2 ++
.../Checkout/view/frontend/templates/cart/item/default.phtml | 2 ++
.../view/frontend/templates/cart/item/price/sidebar.phtml | 2 ++
.../Checkout/view/frontend/templates/cart/methods.phtml | 3 +++
.../Checkout/view/frontend/templates/cart/minicart.phtml | 2 ++
.../Checkout/view/frontend/templates/cart/shipping.phtml | 3 +++
.../view/frontend/templates/cart/sidebar/default.phtml | 3 +++
.../Checkout/view/frontend/templates/item/price/row.phtml | 2 ++
.../Checkout/view/frontend/templates/item/price/unit.phtml | 2 ++
.../Checkout/view/frontend/templates/js/components.phtml | 3 +++
.../Magento/Checkout/view/frontend/templates/onepage.phtml | 2 ++
.../Checkout/view/frontend/templates/onepage/billing.phtml | 3 +++
.../Checkout/view/frontend/templates/onepage/failure.phtml | 3 +++
.../Checkout/view/frontend/templates/onepage/link.phtml | 3 +++
.../Checkout/view/frontend/templates/onepage/login.phtml | 3 +++
.../Checkout/view/frontend/templates/onepage/payment.phtml | 3 +++
.../view/frontend/templates/onepage/payment/methods.phtml | 3 +++
.../Checkout/view/frontend/templates/onepage/progress.phtml | 3 +++
.../view/frontend/templates/onepage/review/info.phtml | 2 ++
.../view/frontend/templates/onepage/review/item.phtml | 2 ++
.../templates/onepage/review/item/price/row_excl_tax.phtml | 2 ++
.../templates/onepage/review/item/price/row_incl_tax.phtml | 2 ++
.../templates/onepage/review/item/price/unit_excl_tax.phtml | 2 ++
.../templates/onepage/review/item/price/unit_incl_tax.phtml | 2 ++
.../view/frontend/templates/onepage/review/totals.phtml | 2 ++
.../Checkout/view/frontend/templates/onepage/shipping.phtml | 3 +++
.../view/frontend/templates/onepage/shipping_method.phtml | 3 +++
.../templates/onepage/shipping_method/additional.phtml | 3 +++
.../templates/onepage/shipping_method/available.phtml | 3 +++
.../Checkout/view/frontend/templates/shipping/price.phtml | 3 +++
.../Magento/Checkout/view/frontend/templates/success.phtml | 3 +++
.../Checkout/view/frontend/templates/total/default.phtml | 3 +++
.../Checkout/view/frontend/templates/total/nominal.phtml | 2 ++
app/code/Magento/CheckoutAgreements/Block/Agreements.php | 3 +++
.../Magento/CheckoutAgreements/Model/Resource/Agreement.php | 3 +++
.../Model/Resource/Agreement/Collection.php | 3 +++
.../CheckoutAgreements/Service/V1/Agreement/ReadService.php | 3 +++
.../view/frontend/templates/agreements.phtml | 3 +++
.../view/frontend/templates/multishipping_agreements.phtml | 3 +++
app/code/Magento/Cms/Block/Block.php | 3 +++
app/code/Magento/Cms/Model/Resource/Page.php | 3 +++
.../Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php | 3 +++
app/code/Magento/Cms/data/cms_setup/data-install-2.0.0.php | 2 ++
.../Cms/view/adminhtml/templates/browser/content.phtml | 3 +++
.../Cms/view/adminhtml/templates/browser/content/files.phtml | 3 +++
.../view/adminhtml/templates/browser/content/uploader.phtml | 3 +++
.../Magento/Cms/view/adminhtml/templates/browser/tree.phtml | 3 +++
.../templates/page/edit/form/renderer/content.phtml | 3 +++
app/code/Magento/Cms/view/frontend/templates/content.phtml | 3 +++
app/code/Magento/Cms/view/frontend/templates/meta.phtml | 3 +++
.../templates/catalog/product/attribute/set/js.phtml | 3 +++
.../catalog/product/composite/fieldset/configurable.phtml | 3 +++
.../catalog/product/edit/super/attribute-js-template.phtml | 3 +++
.../catalog/product/edit/super/attribute-template.phtml | 3 +++
.../templates/catalog/product/edit/super/config.phtml | 3 +++
.../templates/catalog/product/edit/super/matrix.phtml | 3 +++
.../configurable/affected-attribute-set-selector/form.phtml | 2 ++
.../configurable/affected-attribute-set-selector/js.phtml | 3 +++
.../view/frontend/templates/js/components.phtml | 3 +++
.../templates/product/view/type/options/configurable.phtml | 3 +++
app/code/Magento/Contact/view/frontend/templates/form.phtml | 3 +++
app/code/Magento/Core/Model/Asset/Config.php | 3 +++
app/code/Magento/Core/Model/File/Storage.php | 3 +++
.../Magento/Core/Model/File/Storage/Directory/Database.php | 3 +++
.../Core/Model/File/Validator/NotProtectedExtension.php | 3 +++
app/code/Magento/Core/Model/Resource/Config.php | 3 +++
app/code/Magento/Core/Model/Resource/Design.php | 3 +++
app/code/Magento/Core/Model/Resource/Layout/Update.php | 3 +++
app/code/Magento/Core/Model/Resource/Variable.php | 3 +++
.../Core/Model/TemplateEngine/Decorator/DebugHints.php | 3 +++
.../Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php | 3 +++
app/code/Magento/Core/Model/Url/RouteParamsResolver.php | 3 +++
app/code/Magento/Core/Model/Validator/Factory.php | 3 +++
app/code/Magento/Core/Model/Variable/Config.php | 2 ++
app/code/Magento/Core/view/frontend/templates/messages.phtml | 3 +++
.../Controller/Adminhtml/System/Currency/SaveRates.php | 3 +++
.../CurrencySymbol/view/adminhtml/templates/grid.phtml | 3 +++
.../adminhtml/templates/system/currency/rate/matrix.phtml | 3 +++
.../adminhtml/templates/system/currency/rate/services.phtml | 3 +++
.../view/adminhtml/templates/system/currency/rates.phtml | 3 +++
app/code/Magento/Customer/Model/Metadata/ElementFactory.php | 3 +++
.../Magento/Customer/Model/Metadata/Form/AbstractData.php | 3 +++
app/code/Magento/Customer/Model/Observer.php | 3 +++
.../Magento/Customer/view/adminhtml/templates/edit/js.phtml | 3 +++
.../templates/edit/tab/account/form/renderer/group.phtml | 3 +++
.../templates/edit/tab/account/form/renderer/sendemail.phtml | 3 +++
.../sales/order/create/address/form/renderer/vat.phtml | 3 +++
.../view/adminhtml/templates/system/config/validatevat.phtml | 3 +++
.../Customer/view/adminhtml/templates/tab/addresses.phtml | 3 +++
.../Magento/Customer/view/adminhtml/templates/tab/cart.phtml | 3 +++
.../Customer/view/adminhtml/templates/tab/newsletter.phtml | 3 +++
.../view/adminhtml/templates/tab/view/personal_info.phtml | 2 ++
.../Customer/view/adminhtml/templates/tab/view/sales.phtml | 3 +++
.../Customer/view/frontend/templates/account/customer.phtml | 5 ++++-
.../view/frontend/templates/account/dashboard/address.phtml | 2 ++
.../view/frontend/templates/account/dashboard/info.phtml | 2 ++
.../Customer/view/frontend/templates/account/link/back.phtml | 3 +++
.../view/frontend/templates/additionalinfocustomer.phtml | 3 +++
.../Customer/view/frontend/templates/address/book.phtml | 3 +++
.../Customer/view/frontend/templates/address/edit.phtml | 3 +++
.../Customer/view/frontend/templates/form/confirmation.phtml | 3 +++
.../Magento/Customer/view/frontend/templates/form/edit.phtml | 2 ++
.../view/frontend/templates/form/forgotpassword.phtml | 3 +++
.../Customer/view/frontend/templates/form/login.phtml | 2 ++
.../Customer/view/frontend/templates/form/newsletter.phtml | 3 +++
.../Customer/view/frontend/templates/form/register.phtml | 3 +++
.../frontend/templates/form/resetforgottenpassword.phtml | 2 ++
.../Customer/view/frontend/templates/js/components.phtml | 3 +++
.../Customer/view/frontend/templates/newcustomer.phtml | 3 +++
.../Customer/view/frontend/templates/widget/dob.phtml | 2 ++
.../Customer/view/frontend/templates/widget/gender.phtml | 3 +++
.../Customer/view/frontend/templates/widget/name.phtml | 2 ++
.../Customer/view/frontend/templates/widget/taxvat.phtml | 3 +++
.../DesignEditor/Block/Adminhtml/Editor/Container.php | 3 +++
.../DesignEditor/Block/Adminhtml/Editor/Form/Renderer.php | 2 ++
.../Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php | 3 +++
.../Adminhtml/System/Design/Editor/Tools/JsList.php | 3 +++
.../Model/Editor/Tools/QuickStyles/Form/Renderer/Factory.php | 3 +++
.../Model/Editor/Tools/QuickStyles/Renderer/Factory.php | 3 +++
.../view/adminhtml/templates/editor/container.phtml | 3 +++
.../templates/editor/form/renderer/color-picker.phtml | 3 +++
.../adminhtml/templates/editor/form/renderer/composite.phtml | 3 +++
.../templates/editor/form/renderer/composite/children.phtml | 3 +++
.../templates/editor/form/renderer/composite/wrapper.phtml | 3 +++
.../templates/editor/form/renderer/element/wrapper.phtml | 3 +++
.../templates/editor/form/renderer/logo-uploader.phtml | 3 +++
.../adminhtml/templates/editor/form/renderer/simple.phtml | 3 +++
.../adminhtml/templates/editor/form/renderer/template.phtml | 3 +++
.../view/adminhtml/templates/editor/toolbar/buttons.phtml | 3 +++
.../adminhtml/templates/editor/toolbar/buttons/edit.phtml | 3 +++
.../DesignEditor/view/adminhtml/templates/editor/tools.phtml | 3 +++
.../view/adminhtml/templates/editor/tools/block.phtml | 3 +++
.../view/adminhtml/templates/editor/tools/code/custom.phtml | 3 +++
.../view/adminhtml/templates/editor/tools/code/js.phtml | 3 +++
.../templates/editor/tools/files/content/files.phtml | 3 +++
.../view/adminhtml/templates/editor/tools/settings.phtml | 3 +++
.../view/adminhtml/templates/editor/tools/tabs.phtml | 3 +++
.../adminhtml/templates/editor/tools/tabs/super-handle.phtml | 3 +++
.../view/adminhtml/templates/theme/available.phtml | 3 +++
.../DesignEditor/view/adminhtml/templates/theme/button.phtml | 3 +++
.../view/adminhtml/templates/theme/customized.phtml | 3 +++
.../view/adminhtml/templates/theme/list/available.phtml | 3 +++
.../view/adminhtml/templates/theme/list/customized.phtml | 3 +++
.../adminhtml/templates/theme/selector/first_entrance.phtml | 3 +++
.../view/adminhtml/templates/theme/selector/storeview.phtml | 3 +++
.../view/adminhtml/templates/theme/selector/theme_edit.phtml | 3 +++
.../view/frontend/templates/translate_inline.phtml | 3 +++
app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php | 3 +++
app/code/Magento/Dhl/Model/Carrier.php | 3 +++
.../Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php | 3 +++
app/code/Magento/Directory/Model/Country.php | 2 ++
app/code/Magento/Directory/Model/Currency/Import/Factory.php | 3 +++
.../Magento/Directory/Model/Currency/Import/Webservicex.php | 2 ++
.../Magento/Directory/Model/Resource/Country/Collection.php | 2 ++
app/code/Magento/Directory/Model/Resource/Region.php | 2 ++
.../Magento/Directory/view/frontend/templates/currency.phtml | 3 +++
.../Directory/view/frontend/templates/currency/switch.phtml | 3 +++
.../Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php | 3 +++
.../Magento/Downloadable/Block/Catalog/Product/Samples.php | 3 +++
.../Downloadable/Block/Customer/Products/ListProducts.php | 3 +++
.../Block/Sales/Order/Email/Items/Downloadable.php | 3 +++
.../Block/Sales/Order/Email/Items/Order/Downloadable.php | 3 +++
.../Block/Sales/Order/Item/Renderer/Downloadable.php | 3 +++
.../Magento/Downloadable/Controller/Customer/Products.php | 3 +++
.../Downloadable/Helper/Catalog/Product/Configuration.php | 3 +++
app/code/Magento/Downloadable/Helper/Download.php | 3 +++
.../Model/Sales/Order/Pdf/Items/AbstractItems.php | 3 +++
.../templates/product/composite/fieldset/downloadable.phtml | 3 +++
.../view/adminhtml/templates/product/edit/downloadable.phtml | 3 +++
.../templates/product/edit/downloadable/links.phtml | 3 +++
.../templates/product/edit/downloadable/samples.phtml | 3 +++
.../sales/items/column/downloadable/creditmemo/name.phtml | 3 +++
.../sales/items/column/downloadable/invoice/name.phtml | 3 +++
.../templates/sales/items/column/downloadable/name.phtml | 3 +++
.../view/frontend/templates/catalog/product/links.phtml | 3 +++
.../view/frontend/templates/catalog/product/samples.phtml | 2 ++
.../view/frontend/templates/catalog/product/type.phtml | 2 ++
.../view/frontend/templates/checkout/cart/item/default.phtml | 3 +++
.../view/frontend/templates/checkout/links.phtml | 3 +++
.../view/frontend/templates/checkout/success.phtml | 3 +++
.../view/frontend/templates/customer/products/list.phtml | 3 +++
.../email/order/items/creditmemo/downloadable.phtml | 3 +++
.../templates/email/order/items/invoice/downloadable.phtml | 3 +++
.../templates/email/order/items/order/downloadable.phtml | 3 +++
.../Downloadable/view/frontend/templates/js/components.phtml | 3 +++
.../sales/order/creditmemo/items/renderer/downloadable.phtml | 2 ++
.../sales/order/invoice/items/renderer/downloadable.phtml | 2 ++
.../templates/sales/order/items/renderer/downloadable.phtml | 2 ++
.../Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php | 2 ++
app/code/Magento/Eav/Helper/Data.php | 3 +++
app/code/Magento/Eav/Model/Attribute.php | 2 ++
app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php | 3 +++
app/code/Magento/Eav/Model/AttributeDataFactory.php | 3 +++
app/code/Magento/Eav/Model/Entity/AbstractEntity.php | 3 +++
.../Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php | 3 +++
.../Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php | 3 +++
.../Email/view/adminhtml/templates/template/edit.phtml | 3 +++
.../Email/view/adminhtml/templates/template/list.phtml | 3 +++
app/code/Magento/Fedex/Model/Carrier.php | 3 +++
app/code/Magento/GiftMessage/Helper/Message.php | 3 +++
.../view/adminhtml/templates/giftoptionsform.phtml | 3 +++
.../Magento/GiftMessage/view/adminhtml/templates/popup.phtml | 3 +++
.../adminhtml/templates/sales/order/create/giftoptions.phtml | 3 +++
.../view/adminhtml/templates/sales/order/create/items.phtml | 3 +++
.../adminhtml/templates/sales/order/view/giftoptions.phtml | 3 +++
.../view/adminhtml/templates/sales/order/view/items.phtml | 3 +++
.../Magento/GiftMessage/view/frontend/templates/inline.phtml | 3 +++
app/code/Magento/GoogleAnalytics/Block/Ga.php | 3 +++
app/code/Magento/GoogleAnalytics/Helper/Data.php | 3 +++
.../Magento/GoogleAnalytics/view/frontend/templates/ga.phtml | 3 +++
app/code/Magento/GoogleOptimizer/Block/Code/Category.php | 3 +++
app/code/Magento/GoogleOptimizer/Block/Code/Product.php | 3 +++
app/code/Magento/GoogleOptimizer/Helper/Data.php | 3 +++
.../GoogleOptimizer/Model/Observer/Block/Category/Tab.php | 3 +++
.../Magento/GoogleShopping/Block/Adminhtml/Items/Item.php | 3 +++
.../Controller/Adminhtml/Googleshopping/Items/Index.php | 3 +++
.../Controller/Adminhtml/Googleshopping/Items/Refresh.php | 3 +++
app/code/Magento/GoogleShopping/Helper/Category.php | 3 +++
.../GoogleShopping/Model/Attribute/DefaultAttribute.php | 2 ++
app/code/Magento/GoogleShopping/Model/Attribute/Price.php | 3 +++
app/code/Magento/GoogleShopping/Model/Config.php | 3 +++
.../GoogleShopping/Model/Resource/Attribute/Collection.php | 3 +++
.../GoogleShopping/Model/Resource/Grid/Collection.php | 2 ++
app/code/Magento/GoogleShopping/Model/Service.php | 3 +++
.../GoogleShopping/Model/Source/Destinationstates.php | 3 +++
.../GoogleShopping/view/adminhtml/templates/captcha.phtml | 3 +++
.../GoogleShopping/view/adminhtml/templates/types/edit.phtml | 3 +++
.../view/adminhtml/templates/types/edit/attributes.phtml | 3 +++
.../view/adminhtml/templates/types/edit/select.phtml | 3 +++
.../catalog/product/composite/fieldset/grouped.phtml | 3 +++
.../view/adminhtml/templates/product/grouped/grouped.phtml | 2 ++
.../view/base/templates/product/price/final_price.phtml | 2 ++
.../view/frontend/templates/product/view/type/default.phtml | 3 +++
.../view/frontend/templates/product/view/type/grouped.phtml | 2 ++
app/code/Magento/ImportExport/Helper/Data.php | 3 +++
app/code/Magento/ImportExport/Model/Export.php | 3 +++
.../Magento/ImportExport/Model/Export/Entity/Factory.php | 2 ++
app/code/Magento/ImportExport/Model/Import.php | 3 +++
.../Magento/ImportExport/Model/Import/Entity/Factory.php | 2 ++
.../adminhtml/templates/integration/tokens_exchange.phtml | 3 +++
.../view/frontend/templates/layer/filter.phtml | 3 +++
.../view/frontend/templates/layer/state.phtml | 3 +++
.../view/frontend/templates/layer/view.phtml | 3 +++
app/code/Magento/Log/Model/Resource/Visitor/Online.php | 3 +++
.../Log/view/adminhtml/templates/customer/status.phtml | 2 ++
app/code/Magento/Log/view/adminhtml/templates/online.phtml | 3 +++
.../Msrp/view/base/templates/product/price/msrp.phtml | 2 ++
app/code/Magento/Msrp/view/frontend/templates/popup.phtml | 3 +++
.../frontend/templates/render/item/price_msrp_item.phtml | 3 +++
.../view/frontend/templates/render/item/price_msrp_rss.phtml | 3 +++
app/code/Magento/Multishipping/Helper/Data.php | 3 +++
.../Multishipping/Model/Checkout/Type/Multishipping.php | 3 +++
.../view/frontend/templates/checkout/address/select.phtml | 2 ++
.../view/frontend/templates/checkout/addresses.phtml | 3 +++
.../view/frontend/templates/checkout/billing.phtml | 3 +++
.../view/frontend/templates/checkout/billing/items.phtml | 3 +++
.../view/frontend/templates/checkout/item/default.phtml | 3 +++
.../view/frontend/templates/checkout/link.phtml | 3 +++
.../view/frontend/templates/checkout/overview.phtml | 3 +++
.../view/frontend/templates/checkout/overview/item.phtml | 3 +++
.../view/frontend/templates/checkout/shipping.phtml | 3 +++
.../view/frontend/templates/checkout/state.phtml | 3 +++
.../view/frontend/templates/checkout/success.phtml | 3 +++
.../view/frontend/templates/js/components.phtml | 3 +++
.../view/frontend/templates/multishipping/item/default.phtml | 3 +++
.../Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php | 3 +++
.../Magento/Newsletter/Block/Adminhtml/Template/Edit.php | 2 ++
.../Magento/Newsletter/Controller/Adminhtml/Queue/Save.php | 3 +++
.../Magento/Newsletter/Model/Resource/Grid/Collection.php | 2 ++
app/code/Magento/Newsletter/Model/Resource/Template.php | 3 +++
.../view/adminhtml/templates/preview/iframeswitcher.phtml | 3 +++
.../Newsletter/view/adminhtml/templates/preview/store.phtml | 3 +++
.../Newsletter/view/adminhtml/templates/problem/list.phtml | 3 +++
.../Newsletter/view/adminhtml/templates/queue/edit.phtml | 3 +++
.../Newsletter/view/adminhtml/templates/queue/list.phtml | 3 +++
.../view/adminhtml/templates/subscriber/list.phtml | 3 +++
.../Newsletter/view/adminhtml/templates/template/edit.phtml | 3 +++
.../Newsletter/view/adminhtml/templates/template/list.phtml | 3 +++
.../Newsletter/view/frontend/templates/js/components.phtml | 3 +++
.../Newsletter/view/frontend/templates/subscribe.phtml | 3 +++
.../view/adminhtml/templates/form/banktransfer.phtml | 3 +++
.../view/adminhtml/templates/form/cashondelivery.phtml | 2 ++
.../view/adminhtml/templates/form/checkmo.phtml | 3 +++
.../view/adminhtml/templates/form/purchaseorder.phtml | 3 +++
.../view/adminhtml/templates/info/checkmo.phtml | 3 +++
.../view/adminhtml/templates/info/pdf/checkmo.phtml | 3 +++
.../view/frontend/templates/form/banktransfer.phtml | 3 +++
.../view/frontend/templates/form/cashondelivery.phtml | 2 ++
.../view/frontend/templates/form/checkmo.phtml | 3 +++
.../view/frontend/templates/form/purchaseorder.phtml | 3 +++
.../view/frontend/templates/info/checkmo.phtml | 3 +++
.../Model/Plugin/Checkout/Block/Cart/Shipping.php | 2 ++
.../PageCache/view/frontend/templates/js/components.phtml | 3 +++
app/code/Magento/Payment/Model/Method/AbstractMethod.php | 3 +++
.../Magento/Payment/view/adminhtml/templates/form/cc.phtml | 3 +++
.../Payment/view/adminhtml/templates/info/default.phtml | 3 +++
.../Payment/view/adminhtml/templates/info/instructions.phtml | 3 +++
.../Payment/view/adminhtml/templates/info/pdf/default.phtml | 3 +++
.../Payment/view/adminhtml/templates/info/substitution.phtml | 3 +++
.../Magento/Payment/view/frontend/templates/form/cc.phtml | 3 +++
.../Payment/view/frontend/templates/info/default.phtml | 3 +++
.../Payment/view/frontend/templates/info/instructions.phtml | 3 +++
.../Persistent/view/frontend/templates/remember_me.phtml | 3 +++
app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php | 3 +++
app/code/Magento/ProductAlert/Model/Resource/Price.php | 3 +++
app/code/Magento/ProductAlert/Model/Resource/Stock.php | 3 +++
.../ProductAlert/view/frontend/templates/email/price.phtml | 2 ++
.../ProductAlert/view/frontend/templates/email/stock.phtml | 2 ++
app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php | 3 +++
app/code/Magento/Reports/Block/Adminhtml/Grid.php | 3 +++
.../Block/Adminhtml/Grid/Column/Renderer/Currency.php | 3 +++
.../Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php | 3 +++
.../Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php | 3 +++
.../Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php | 3 +++
.../Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php | 3 +++
app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php | 3 +++
app/code/Magento/Reports/Block/Adminhtml/Wishlist.php | 3 +++
app/code/Magento/Reports/Block/Product/Compared.php | 3 +++
app/code/Magento/Reports/Block/Product/Viewed.php | 3 +++
app/code/Magento/Reports/Helper/Data.php | 2 ++
app/code/Magento/Reports/Model/DateFactory.php | 3 +++
.../Entity/Summary/Collection/AbstractCollection.php | 2 ++
app/code/Magento/Reports/Model/Resource/Order/Collection.php | 3 +++
.../Reports/Model/Resource/Product/Index/AbstractIndex.php | 3 +++
app/code/Magento/Reports/Model/Resource/Quote/Collection.php | 2 ++
.../Magento/Reports/Model/Resource/Report/AbstractReport.php | 2 ++
.../Magento/Reports/Model/Resource/Report/Product/Viewed.php | 2 ++
.../Model/Resource/Report/Product/Viewed/Collection.php | 2 ++
.../Reports/data/reports_setup/data-install-2.0.0.php | 2 ++
app/code/Magento/Reports/view/adminhtml/templates/grid.phtml | 3 +++
.../view/adminhtml/templates/report/grid/container.phtml | 3 +++
.../view/adminhtml/templates/report/refresh/statistics.phtml | 3 +++
.../Reports/view/adminhtml/templates/store/switcher.phtml | 3 +++
.../view/adminhtml/templates/store/switcher/enhanced.phtml | 3 +++
.../Reports/view/frontend/templates/js/components.phtml | 3 +++
.../view/frontend/templates/product/widget/viewed.phtml | 3 +++
.../view/frontend/templates/product/widget/viewed/item.phtml | 3 +++
.../widget/compared/column/compared_default_list.phtml | 3 +++
.../widget/compared/column/compared_images_list.phtml | 3 +++
.../widget/compared/column/compared_names_list.phtml | 3 +++
.../templates/widget/compared/content/compared_grid.phtml | 3 +++
.../templates/widget/compared/content/compared_list.phtml | 3 +++
.../templates/widget/viewed/column/viewed_default_list.phtml | 3 +++
.../templates/widget/viewed/column/viewed_images_list.phtml | 3 +++
.../templates/widget/viewed/column/viewed_names_list.phtml | 3 +++
.../templates/widget/viewed/content/viewed_grid.phtml | 3 +++
.../templates/widget/viewed/content/viewed_list.phtml | 3 +++
app/code/Magento/Review/Block/Adminhtml/Add.php | 3 +++
app/code/Magento/Review/Block/Adminhtml/Grid.php | 2 ++
app/code/Magento/Review/Helper/Action/Pager.php | 3 +++
app/code/Magento/Review/Helper/Data.php | 3 +++
.../Review/view/adminhtml/templates/rating/detailed.phtml | 3 +++
.../Review/view/adminhtml/templates/rating/form.phtml | 3 +++
.../Review/view/adminhtml/templates/rating/options.phtml | 3 +++
.../view/adminhtml/templates/rating/stars/detailed.phtml | 3 +++
.../view/adminhtml/templates/rating/stars/summary.phtml | 3 +++
.../Review/view/adminhtml/templates/rss/grid/link.phtml | 2 ++
.../Review/view/frontend/templates/customer/list.phtml | 3 +++
.../Review/view/frontend/templates/customer/recent.phtml | 3 +++
.../Review/view/frontend/templates/customer/view.phtml | 3 +++
.../Magento/Review/view/frontend/templates/detailed.phtml | 3 +++
app/code/Magento/Review/view/frontend/templates/form.phtml | 3 +++
.../Review/view/frontend/templates/helper/summary.phtml | 3 +++
.../view/frontend/templates/helper/summary_short.phtml | 3 +++
.../Review/view/frontend/templates/product/view/count.phtml | 3 +++
.../Review/view/frontend/templates/product/view/list.phtml | 3 +++
.../Review/view/frontend/templates/product/view/other.phtml | 3 +++
.../Magento/Review/view/frontend/templates/redirect.phtml | 3 +++
app/code/Magento/Review/view/frontend/templates/view.phtml | 3 +++
app/code/Magento/Rss/view/frontend/templates/feeds.phtml | 3 +++
app/code/Magento/Rule/Model/AbstractModel.php | 2 ++
.../Sales/Api/CreditmemoCommentRepositoryInterface.php | 3 +++
app/code/Magento/Sales/Api/CreditmemoManagementInterface.php | 3 +++
app/code/Magento/Sales/Api/Data/CreditmemoInterface.php | 3 +++
app/code/Magento/Sales/Api/OrderManagementInterface.php | 3 +++
.../Sales/Api/OrderStatusHistoryRepositoryInterface.php | 3 +++
.../Magento/Sales/Block/Adminhtml/Order/Invoice/View.php | 3 +++
app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php | 3 +++
.../Sales/Block/Order/Item/Renderer/DefaultRenderer.php | 3 +++
app/code/Magento/Sales/Helper/Reorder.php | 3 +++
app/code/Magento/Sales/Model/AdminOrder/Create.php | 3 +++
app/code/Magento/Sales/Model/Order/Creditmemo.php | 3 +++
app/code/Magento/Sales/Model/Order/Email/NotifySender.php | 3 +++
app/code/Magento/Sales/Model/Order/Payment.php | 3 +++
app/code/Magento/Sales/Model/Order/Payment/Transaction.php | 3 +++
app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php | 3 +++
.../Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php | 3 +++
app/code/Magento/Sales/Model/Order/Shipment/Item.php | 3 +++
app/code/Magento/Sales/Model/Quote.php | 3 +++
.../Magento/Sales/Model/Quote/Address/Total/Collector.php | 3 +++
app/code/Magento/Sales/Model/Quote/Item.php | 3 +++
app/code/Magento/Sales/Model/Resource/Quote.php | 3 +++
.../Sales/Model/Resource/Report/Bestsellers/Collection.php | 3 +++
.../Sales/view/adminhtml/templates/items/column/name.phtml | 3 +++
.../Sales/view/adminhtml/templates/items/column/qty.phtml | 3 +++
.../Sales/view/adminhtml/templates/items/price/row.phtml | 3 +++
.../Sales/view/adminhtml/templates/items/price/total.phtml | 3 +++
.../Sales/view/adminhtml/templates/items/price/unit.phtml | 3 +++
.../view/adminhtml/templates/items/renderer/default.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/address/form.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/comments/view.phtml | 3 +++
.../view/adminhtml/templates/order/create/abstract.phtml | 3 +++
.../templates/order/create/billing/method/form.phtml | 3 +++
.../view/adminhtml/templates/order/create/comment.phtml | 3 +++
.../view/adminhtml/templates/order/create/coupons/form.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/create/data.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/create/form.phtml | 3 +++
.../view/adminhtml/templates/order/create/form/address.phtml | 2 ++
.../view/adminhtml/templates/order/create/giftmessage.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/create/items.phtml | 3 +++
.../view/adminhtml/templates/order/create/items/grid.phtml | 2 ++
.../adminhtml/templates/order/create/items/price/row.phtml | 3 +++
.../adminhtml/templates/order/create/items/price/total.phtml | 3 +++
.../adminhtml/templates/order/create/items/price/unit.phtml | 3 +++
.../adminhtml/templates/order/create/newsletter/form.phtml | 3 +++
.../templates/order/create/shipping/method/form.phtml | 3 +++
.../view/adminhtml/templates/order/create/sidebar.phtml | 2 ++
.../adminhtml/templates/order/create/sidebar/items.phtml | 3 +++
.../view/adminhtml/templates/order/create/store/select.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/create/totals.phtml | 3 +++
.../adminhtml/templates/order/create/totals/default.phtml | 3 +++
.../adminhtml/templates/order/create/totals/grandtotal.phtml | 3 +++
.../adminhtml/templates/order/create/totals/shipping.phtml | 3 +++
.../adminhtml/templates/order/create/totals/subtotal.phtml | 3 +++
.../view/adminhtml/templates/order/create/totals/tax.phtml | 3 +++
.../adminhtml/templates/order/creditmemo/create/form.phtml | 3 +++
.../adminhtml/templates/order/creditmemo/create/items.phtml | 3 +++
.../order/creditmemo/create/items/renderer/default.phtml | 3 +++
.../order/creditmemo/create/totals/adjustments.phtml | 3 +++
.../adminhtml/templates/order/creditmemo/view/form.phtml | 3 +++
.../adminhtml/templates/order/creditmemo/view/items.phtml | 3 +++
.../order/creditmemo/view/items/renderer/default.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/details.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/giftoptions.phtml | 3 +++
.../view/adminhtml/templates/order/invoice/create/form.phtml | 3 +++
.../adminhtml/templates/order/invoice/create/items.phtml | 3 +++
.../order/invoice/create/items/renderer/default.phtml | 3 +++
.../view/adminhtml/templates/order/invoice/view/form.phtml | 3 +++
.../view/adminhtml/templates/order/invoice/view/items.phtml | 3 +++
.../order/invoice/view/items/renderer/default.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/totalbar.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/totals.phtml | 3 +++
.../view/adminhtml/templates/order/totals/discount.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/totals/due.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/totals/grand.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/totals/item.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/totals/paid.phtml | 3 +++
.../view/adminhtml/templates/order/totals/refunded.phtml | 3 +++
.../view/adminhtml/templates/order/totals/shipping.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/totals/tax.phtml | 3 +++
.../view/adminhtml/templates/order/view/giftmessage.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/view/history.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/view/info.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/view/items.phtml | 3 +++
.../templates/order/view/items/renderer/default.phtml | 3 +++
.../view/adminhtml/templates/order/view/tab/history.phtml | 3 +++
.../Sales/view/adminhtml/templates/order/view/tab/info.phtml | 3 +++
.../Sales/view/adminhtml/templates/page/js/components.phtml | 3 +++
.../Sales/view/adminhtml/templates/rss/order/grid/link.phtml | 2 ++
.../Sales/view/adminhtml/templates/transactions/detail.phtml | 3 +++
.../view/frontend/templates/email/creditmemo/items.phtml | 3 +++
.../Sales/view/frontend/templates/email/invoice/items.phtml | 3 +++
.../Magento/Sales/view/frontend/templates/email/items.phtml | 3 +++
.../frontend/templates/email/items/creditmemo/default.phtml | 3 +++
.../frontend/templates/email/items/invoice/default.phtml | 3 +++
.../view/frontend/templates/email/items/order/default.phtml | 2 ++
.../view/frontend/templates/email/items/price/row.phtml | 3 +++
.../frontend/templates/email/items/shipment/default.phtml | 3 +++
.../Sales/view/frontend/templates/email/shipment/items.phtml | 3 +++
.../Sales/view/frontend/templates/email/shipment/track.phtml | 3 +++
.../Magento/Sales/view/frontend/templates/guest/form.phtml | 3 +++
.../Sales/view/frontend/templates/items/price/row.phtml | 2 ++
.../templates/items/price/total_after_discount.phtml | 2 ++
.../Sales/view/frontend/templates/items/price/unit.phtml | 2 ++
.../Sales/view/frontend/templates/js/components.phtml | 3 +++
.../Sales/view/frontend/templates/order/comments.phtml | 3 +++
.../view/frontend/templates/order/creditmemo/items.phtml | 3 +++
.../templates/order/creditmemo/items/renderer/default.phtml | 3 +++
.../Sales/view/frontend/templates/order/history.phtml | 3 +++
.../Magento/Sales/view/frontend/templates/order/info.phtml | 3 +++
.../Sales/view/frontend/templates/order/info/buttons.phtml | 3 +++
.../view/frontend/templates/order/info/buttons/rss.phtml | 2 ++
.../Sales/view/frontend/templates/order/invoice/items.phtml | 3 +++
.../templates/order/invoice/items/renderer/default.phtml | 3 +++
.../Magento/Sales/view/frontend/templates/order/items.phtml | 3 +++
.../frontend/templates/order/items/renderer/default.phtml | 2 ++
.../Sales/view/frontend/templates/order/order_comments.phtml | 3 +++
.../Sales/view/frontend/templates/order/order_date.phtml | 3 +++
.../view/frontend/templates/order/print/creditmemo.phtml | 3 +++
.../Sales/view/frontend/templates/order/print/invoice.phtml | 3 +++
.../Sales/view/frontend/templates/order/print/shipment.phtml | 3 +++
.../Magento/Sales/view/frontend/templates/order/recent.phtml | 3 +++
.../templates/order/shipment/items/renderer/default.phtml | 3 +++
.../Magento/Sales/view/frontend/templates/order/totals.phtml | 3 +++
.../Magento/Sales/view/frontend/templates/order/view.phtml | 3 +++
.../Sales/view/frontend/templates/reorder/sidebar.phtml | 3 +++
.../Sales/view/frontend/templates/widget/guest/form.phtml | 3 +++
.../Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php | 3 +++
.../SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php | 3 +++
app/code/Magento/SalesRule/Helper/Coupon.php | 3 +++
.../SalesRule/Model/Resource/Report/Rule/Createdat.php | 3 +++
.../Magento/SalesRule/Model/Resource/Rule/Collection.php | 3 +++
app/code/Magento/SalesRule/Model/Validator.php | 3 +++
app/code/Magento/Search/Model/Resource/Query.php | 3 +++
.../Magento/Search/view/frontend/templates/search_data.phtml | 3 +++
app/code/Magento/Search/view/frontend/templates/term.phtml | 3 +++
app/code/Magento/Sendfriend/Controller/Product/Sendmail.php | 3 +++
app/code/Magento/Sendfriend/Helper/Data.php | 3 +++
.../Magento/Sendfriend/view/frontend/templates/send.phtml | 3 +++
app/code/Magento/Shipping/Block/Tracking/Popup.php | 3 +++
app/code/Magento/Shipping/Helper/Data.php | 2 ++
app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php | 3 +++
app/code/Magento/Shipping/Model/Config.php | 3 +++
app/code/Magento/Shipping/Model/Info.php | 3 +++
app/code/Magento/Shipping/Model/Shipping/Labels.php | 3 +++
.../Shipping/view/adminhtml/templates/create/form.phtml | 3 +++
.../Shipping/view/adminhtml/templates/create/items.phtml | 3 +++
.../adminhtml/templates/create/items/renderer/default.phtml | 3 +++
.../view/adminhtml/templates/order/Tracking/view.phtml | 3 +++
.../view/adminhtml/templates/order/packaging/grid.phtml | 3 +++
.../view/adminhtml/templates/order/packaging/packed.phtml | 3 +++
.../view/adminhtml/templates/order/packaging/popup.phtml | 3 +++
.../Shipping/view/adminhtml/templates/order/tracking.phtml | 3 +++
.../Shipping/view/adminhtml/templates/order/view/info.phtml | 3 +++
.../Shipping/view/adminhtml/templates/view/form.phtml | 3 +++
.../Shipping/view/adminhtml/templates/view/items.phtml | 3 +++
.../adminhtml/templates/view/items/renderer/default.phtml | 3 +++
.../Magento/Shipping/view/frontend/templates/items.phtml | 3 +++
.../Shipping/view/frontend/templates/tracking/link.phtml | 3 +++
.../Shipping/view/frontend/templates/tracking/popup.phtml | 3 +++
app/code/Magento/Sitemap/Model/Sitemap.php | 3 +++
app/code/Magento/Store/Model/Resource/Website.php | 3 +++
.../Magento/Store/view/frontend/templates/switch/flags.phtml | 3 +++
.../Store/view/frontend/templates/switch/languages.phtml | 3 +++
.../Store/view/frontend/templates/switch/stores.phtml | 3 +++
app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php | 2 ++
app/code/Magento/Tax/Helper/Data.php | 3 +++
app/code/Magento/Tax/Model/Calculation/Rate.php | 2 ++
app/code/Magento/Tax/Model/Observer.php | 2 ++
app/code/Magento/Tax/Model/Resource/Sales/Order/Tax/Item.php | 2 ++
.../Tax/Model/Sales/Total/Quote/CommonTaxCollector.php | 3 +++
.../Tax/view/adminhtml/templates/items/price/row.phtml | 3 +++
.../Tax/view/adminhtml/templates/items/price/total.phtml | 3 +++
.../Tax/view/adminhtml/templates/items/price/unit.phtml | 3 +++
.../adminhtml/templates/order/create/items/price/row.phtml | 3 +++
.../adminhtml/templates/order/create/items/price/total.phtml | 3 +++
.../adminhtml/templates/order/create/items/price/unit.phtml | 3 +++
.../Magento/Tax/view/adminhtml/templates/rate/form.phtml | 3 +++
app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml | 3 +++
.../Magento/Tax/view/adminhtml/templates/rate/title.phtml | 3 +++
.../Tax/view/adminhtml/templates/toolbar/class/save.phtml | 3 +++
.../Tax/view/adminhtml/templates/toolbar/rate/add.phtml | 3 +++
.../Tax/view/adminhtml/templates/toolbar/rate/save.phtml | 3 +++
.../Tax/view/adminhtml/templates/toolbar/rule/save.phtml | 3 +++
.../Magento/Tax/view/base/templates/pricing/adjustment.phtml | 3 +++
.../Tax/view/base/templates/pricing/adjustment/bundle.phtml | 3 +++
.../templates/checkout/cart/item/price/sidebar.phtml | 2 ++
.../frontend/templates/checkout/cart/minicart/totals.phtml | 2 ++
.../Tax/view/frontend/templates/checkout/grandtotal.phtml | 3 +++
.../Tax/view/frontend/templates/checkout/shipping.phtml | 3 +++
.../view/frontend/templates/checkout/shipping/price.phtml | 3 +++
.../Tax/view/frontend/templates/checkout/subtotal.phtml | 3 +++
.../Magento/Tax/view/frontend/templates/checkout/tax.phtml | 3 +++
.../Tax/view/frontend/templates/email/items/price/row.phtml | 3 +++
.../Magento/Tax/view/frontend/templates/item/price/row.phtml | 2 ++
.../frontend/templates/item/price/total_after_discount.phtml | 2 ++
.../Tax/view/frontend/templates/item/price/unit.phtml | 2 ++
app/code/Magento/Tax/view/frontend/templates/order/tax.phtml | 3 +++
.../view/adminhtml/templates/importExport.phtml | 3 +++
.../view/adminhtml/templates/browser/content/files.phtml | 3 +++
app/code/Magento/Theme/view/base/templates/root.phtml | 3 +++
.../Theme/view/frontend/templates/callouts/left_col.phtml | 3 +++
.../Theme/view/frontend/templates/callouts/right_col.phtml | 3 +++
.../Magento/Theme/view/frontend/templates/html/block.phtml | 3 +++
.../Theme/view/frontend/templates/html/breadcrumbs.phtml | 3 +++
.../Theme/view/frontend/templates/html/collapsible.phtml | 3 +++
.../Theme/view/frontend/templates/html/container.phtml | 3 +++
.../Magento/Theme/view/frontend/templates/html/footer.phtml | 3 +++
.../Magento/Theme/view/frontend/templates/html/header.phtml | 3 +++
.../Theme/view/frontend/templates/html/header/logo.phtml | 3 +++
.../Magento/Theme/view/frontend/templates/html/notices.phtml | 3 +++
.../Magento/Theme/view/frontend/templates/html/pager.phtml | 3 +++
.../Theme/view/frontend/templates/html/sections.phtml | 3 +++
.../Theme/view/frontend/templates/html/skiptarget.phtml | 3 +++
.../Magento/Theme/view/frontend/templates/html/title.phtml | 2 ++
.../Magento/Theme/view/frontend/templates/html/topmenu.phtml | 3 +++
.../Theme/view/frontend/templates/js/components.phtml | 3 +++
app/code/Magento/Theme/view/frontend/templates/link.phtml | 3 +++
app/code/Magento/Translation/Model/Js/DataProvider.php | 2 ++
.../view/adminhtml/templates/translate_inline.phtml | 3 +++
.../view/frontend/templates/translate_inline.phtml | 3 +++
app/code/Magento/Ui/Controller/Adminhtml/Form/Fieldset.php | 3 +++
app/code/Magento/Ui/DataProvider/Config/Converter.php | 2 ++
.../Ui/view/base/templates/control/button/default.phtml | 3 +++
.../Magento/Ui/view/base/templates/filter_pool/active.phtml | 3 +++
.../Ui/view/base/templates/form/fieldset/default.phtml | 3 +++
.../Ui/view/base/templates/layout/group/default.phtml | 3 +++
app/code/Magento/Ups/Model/Carrier.php | 3 +++
.../adminhtml/templates/system/shipping/carrier_config.phtml | 2 ++
.../UrlRewrite/view/adminhtml/templates/categories.phtml | 3 +++
.../Magento/UrlRewrite/view/adminhtml/templates/edit.phtml | 3 +++
.../UrlRewrite/view/adminhtml/templates/selector.phtml | 3 +++
app/code/Magento/User/Block/User/Edit/Tab/Main.php | 3 +++
app/code/Magento/User/Model/Resource/User.php | 3 +++
.../User/view/adminhtml/templates/admin/forgotpassword.phtml | 3 +++
.../view/adminhtml/templates/admin/forgotpassword_url.phtml | 3 +++
.../adminhtml/templates/admin/resetforgottenpassword.phtml | 3 +++
.../Magento/User/view/adminhtml/templates/role/edit.phtml | 3 +++
.../User/view/adminhtml/templates/role/users_grid_js.phtml | 3 +++
.../User/view/adminhtml/templates/user/roles_grid_js.phtml | 3 +++
app/code/Magento/Usps/Model/Carrier.php | 3 +++
app/code/Magento/Usps/Model/Source/Method.php | 3 +++
.../integration/activate/permissions/tab/webapi.phtml | 3 +++
.../Webapi/view/adminhtml/templates/resourcetree.phtml | 3 +++
app/code/Magento/Weee/Block/Renderer/Weee/Tax.php | 3 +++
app/code/Magento/Weee/Model/Total/Quote/Weee.php | 3 +++
.../Weee/view/adminhtml/templates/items/price/row.phtml | 3 +++
.../Weee/view/adminhtml/templates/items/price/total.phtml | 3 +++
.../Weee/view/adminhtml/templates/items/price/unit.phtml | 3 +++
.../adminhtml/templates/order/create/items/price/row.phtml | 3 +++
.../adminhtml/templates/order/create/items/price/total.phtml | 3 +++
.../adminhtml/templates/order/create/items/price/unit.phtml | 3 +++
.../Magento/Weee/view/adminhtml/templates/renderer/tax.phtml | 3 +++
.../Weee/view/base/templates/pricing/adjustment.phtml | 3 +++
.../templates/checkout/cart/item/price/sidebar.phtml | 2 ++
.../checkout/onepage/review/item/price/row_excl_tax.phtml | 2 ++
.../checkout/onepage/review/item/price/row_incl_tax.phtml | 2 ++
.../checkout/onepage/review/item/price/unit_excl_tax.phtml | 2 ++
.../checkout/onepage/review/item/price/unit_incl_tax.phtml | 2 ++
.../Weee/view/frontend/templates/email/items/price/row.phtml | 3 +++
.../Weee/view/frontend/templates/item/price/row.phtml | 2 ++
.../frontend/templates/item/price/total_after_discount.phtml | 2 ++
.../Weee/view/frontend/templates/item/price/unit.phtml | 2 ++
app/code/Magento/Widget/Block/Adminhtml/Widget.php | 2 ++
.../Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php | 3 +++
app/code/Magento/Widget/Model/Widget.php | 2 ++
.../view/adminhtml/templates/instance/edit/layout.phtml | 3 +++
app/code/Magento/Wishlist/Model/Item.php | 3 +++
.../Magento/Wishlist/sql/wishlist_setup/install-2.0.0.php | 2 ++
.../adminhtml/templates/customer/edit/tab/wishlist.phtml | 2 ++
.../Wishlist/view/frontend/templates/button/share.phtml | 2 ++
.../Wishlist/view/frontend/templates/button/tocart.phtml | 3 +++
.../Wishlist/view/frontend/templates/button/update.phtml | 3 +++
.../Wishlist/view/frontend/templates/email/items.phtml | 3 +++
.../view/frontend/templates/item/column/actions.phtml | 2 ++
.../Wishlist/view/frontend/templates/item/column/cart.phtml | 2 ++
.../view/frontend/templates/item/column/comment.phtml | 2 ++
.../Wishlist/view/frontend/templates/item/column/edit.phtml | 2 ++
.../Wishlist/view/frontend/templates/item/column/image.phtml | 2 ++
.../Wishlist/view/frontend/templates/item/column/name.phtml | 2 ++
.../Wishlist/view/frontend/templates/item/column/price.phtml | 2 ++
.../view/frontend/templates/item/column/remove.phtml | 3 +++
.../view/frontend/templates/item/configure/addto.phtml | 3 +++
.../Magento/Wishlist/view/frontend/templates/item/list.phtml | 3 +++
.../Wishlist/view/frontend/templates/js/components.phtml | 3 +++
app/code/Magento/Wishlist/view/frontend/templates/link.phtml | 3 +++
.../Wishlist/view/frontend/templates/options_list.phtml | 3 +++
.../Magento/Wishlist/view/frontend/templates/rss/email.phtml | 3 +++
.../Wishlist/view/frontend/templates/rss/wishlist.phtml | 3 +++
.../Magento/Wishlist/view/frontend/templates/shared.phtml | 3 +++
.../Magento/Wishlist/view/frontend/templates/sharing.phtml | 2 ++
.../Magento/Wishlist/view/frontend/templates/sidebar.phtml | 3 +++
app/code/Magento/Wishlist/view/frontend/templates/view.phtml | 3 +++
.../TestModule4/Service/V1/DataObjectServiceInterface.php | 3 +++
.../TestModule4/Service/V1/Entity/ExtensibleRequest.php | 3 +++
.../TestModuleMSC/Model/Data/CustomAttributeDataObject.php | 3 +++
.../Model/Data/CustomAttributeNestedDataObject.php | 3 +++
.../_files/Magento/TestModuleMSC/Model/Data/Item.php | 3 +++
.../Magento/TestFramework/Annotation/ApiDataFixture.php | 3 +++
.../testsuite/Magento/Catalog/Api/CategoryManagementTest.php | 3 +++
.../Magento/Catalog/Api/ProductAttributeManagementTest.php | 3 +++
.../Catalog/Api/ProductCustomOptionRepositoryTest.php | 2 ++
.../Catalog/Api/ProductMediaAttributeManagementTest.php | 3 +++
.../Magento/Catalog/Api/ProductTierPriceManagementTest.php | 2 ++
.../testsuite/Magento/CatalogInventory/Api/StockItemTest.php | 3 +++
.../Magento/ConfigurableProduct/Api/OptionRepositoryTest.php | 3 +++
.../testsuite/Magento/Customer/Api/AddressRepositoryTest.php | 2 ++
.../Service/V1/DownloadableLink/WriteServiceTest.php | 3 +++
.../Service/V1/DownloadableSample/WriteServiceTest.php | 3 +++
.../Magento/GiftMessage/Service/V1/WriteServiceTest.php | 2 ++
.../Magento/Sales/Service/V1/CreditmemoCreateTest.php | 3 +++
.../Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php | 3 +++
.../Magento/Sales/Service/V1/ShipmentCreateTest.php | 3 +++
.../testsuite/Magento/Tax/Api/TaxClassRepositoryTest.php | 2 ++
.../Magento/Webapi/WsdlGenerationFromDataObjectTest.php | 2 ++
.../framework/Magento/TestFramework/Db/Adapter/Mysql.php | 2 ++
.../integration/framework/Magento/TestFramework/Db/Mysql.php | 2 ++
.../Magento/Backend/Block/Widget/Grid/MassactionTest.php | 3 +++
.../Catalog/Controller/Adminhtml/Product/NewActionTest.php | 3 +++
.../Magento/Catalog/Controller/Product/CompareTest.php | 3 +++
.../testsuite/Magento/Catalog/Model/Product/ImageTest.php | 3 +++
.../Magento/Catalog/Model/Resource/Product/OptionTest.php | 3 +++
.../Magento/CatalogImportExport/Model/Import/ProductTest.php | 2 ++
.../Block/Adminhtml/Form/Field/CustomergroupTest.php | 3 +++
.../CatalogSearch/Model/Layer/Filter/CategoryTest.php | 3 +++
.../Model/CategoryUrlRewriteGeneratorTest.php | 3 +++
.../Checkout/_files/quote_with_simple_product_saved.php | 2 ++
.../_files/quote_with_virtual_product_and_address.php | 3 +++
.../testsuite/Magento/Cms/Controller/RouterTest.php | 3 +++
.../Block/Adminhtml/Product/Edit/Tab/Super/ConfigTest.php | 3 +++
.../Model/Product/Type/ConfigurableTest.php | 3 +++
.../testsuite/Magento/Core/Model/Variable/ConfigTest.php | 3 +++
.../testsuite/Magento/Customer/Controller/AccountTest.php | 2 ++
.../testsuite/Magento/Customer/Controller/AjaxLoginTest.php | 2 ++
.../Magento/Customer/Model/CustomerRegistryTest.php | 2 ++
.../Customer/_files/customer_non_default_website_id.php | 2 ++
.../CustomerImportExport/Model/Export/AddressTest.php | 3 +++
.../CustomerImportExport/Model/Import/CustomerTest.php | 3 +++
.../testsuite/Magento/Directory/Model/ObserverTest.php | 2 ++
.../Downloadable/_files/order_with_downloadable_product.php | 2 ++
.../testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php | 2 ++
.../Magento/Framework/Interception/Fixture/Intercepted.php | 3 +++
.../Framework/Interception/Fixture/InterceptedInterface.php | 3 +++
.../Framework/Interception/Fixture/InterceptedParent.php | 3 +++
.../Interception/Fixture/InterceptedParentInterface.php | 3 +++
.../Magento/Framework/Less/File/Collector/AggregatedTest.php | 3 +++
.../Magento/Framework/Model/Resource/Db/AbstractTest.php | 3 +++
.../Magento/Framework/Stdlib/Cookie/CookieScopeTest.php | 2 ++
.../Magento/Framework/Stdlib/Cookie/PhpCookieReaderTest.php | 4 +++-
.../Magento/ImportExport/Model/Export/EntityAbstractTest.php | 2 ++
.../Multishipping/Block/Checkout/Address/SelectTest.php | 2 ++
.../Magento/Multishipping/Block/Checkout/OverviewTest.php | 3 +++
.../Controller/Adminhtml/Report/Product/ViewedTest.php | 3 +++
.../testsuite/Magento/Reports/_files/viewed_products.php | 2 ++
.../Magento/Review/Block/Adminhtml/Edit/FormTest.php | 2 ++
.../integration/testsuite/Magento/Review/Block/FormTest.php | 3 +++
.../Magento/Sales/Model/Resource/Order/StatusTest.php | 2 ++
.../integration/testsuite/Magento/Sales/_files/order.php | 3 +++
.../testsuite/Magento/Sales/_files/order_fixture_store.php | 2 ++
.../integration/testsuite/Magento/Store/Model/StoreTest.php | 3 +++
.../Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php | 3 +++
.../Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php | 2 ++
.../testsuite/Magento/Tax/Pricing/AdjustmentTest.php | 2 ++
.../testsuite/Magento/Test/Integrity/LayoutTest.php | 3 +++
.../User/Controller/Adminhtml/User/InvalidateTokenTest.php | 2 ++
.../integration/testsuite/Magento/User/Model/UserTest.php | 3 +++
.../testsuite/Magento/Widget/Model/Config/ReaderTest.php | 3 +++
.../testsuite/Magento/Wishlist/Helper/RssTest.php | 2 ++
.../TestFramework/CodingStandard/Tool/BlacklistInterface.php | 4 +++-
.../TestFramework/CodingStandard/Tool/CopyPasteDetector.php | 2 ++
.../Magento/Test/Legacy/_files/obsolete_config_nodes.php | 3 +++
.../Magento/Test/Legacy/_files/obsolete_constants.php | 3 +++
.../Magento/Test/Legacy/_files/obsolete_methods.php | 3 +++
.../Magento/Test/Legacy/_files/obsolete_properties.php | 3 +++
.../phpcs/input/coding_style/classes/normal_class.php | 2 ++
.../input/coding_style/functions/method_without_scope.php | 2 ++
.../coding_style/functions/multiline_wrong_declaration.php | 3 +++
.../phpcs/input/coding_style/functions/normal_func.php | 3 +++
.../input/coding_style/functions/unneeded_multiline.php | 3 +++
.../input/coding_style/inline_doc/format/wrong_align.php | 3 +++
.../phpcs/input/coding_style/inline_doc/normal.php | 3 +++
.../phpcs/input/naming/property/normal_underscore.php | 3 +++
dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php | 3 +++
.../Magento/AdminNotification/Block/ToolbarEntryTest.php | 2 ++
.../Backend/Block/System/Config/Form/Field/ImageTest.php | 2 ++
.../Magento/Backend/Block/System/Config/FormTest.php | 3 +++
.../Magento/Backend/Block/Widget/Grid/ColumnSetTest.php | 3 +++
.../Backend/Controller/Adminhtml/Cache/CleanMediaTest.php | 3 +++
.../Controller/Adminhtml/Dashboard/AbstractTestCase.php | 5 ++++-
.../Controller/Adminhtml/Dashboard/CustomersMostTest.php | 5 ++++-
.../Controller/Adminhtml/Dashboard/CustomersNewestTest.php | 5 ++++-
.../Controller/Adminhtml/Dashboard/ProductsViewedTest.php | 5 ++++-
.../Backend/Model/Config/Backend/Cookie/LifetimeTest.php | 3 +++
.../Magento/Backend/Model/Config/Backend/Cookie/PathTest.php | 3 +++
.../Model/Config/Source/Storage/Media/DatabaseTest.php | 3 +++
.../testsuite/Magento/Backend/Model/Config/StructureTest.php | 3 +++
dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php | 2 ++
.../Block/Catalog/Product/View/Type/Bundle/OptionTest.php | 3 +++
.../Bundle/Block/Catalog/Product/View/Type/BundleTest.php | 3 +++
.../testsuite/Magento/Bundle/Model/LinkManagementTest.php | 2 ++
.../Magento/Bundle/Pricing/Adjustment/CalculatorTest.php | 3 +++
.../Magento/Bundle/Pricing/Price/DiscountCalculatorTest.php | 2 ++
.../Magento/Bundle/Pricing/Price/GroupPriceTest.php | 3 +++
.../Block/Adminhtml/Category/AbstractCategoryTest.php | 3 +++
.../unit/testsuite/Magento/Catalog/Block/Layer/ViewTest.php | 3 +++
.../Magento/Catalog/Block/Product/AbstractProductTest.php | 3 +++
.../testsuite/Magento/Catalog/Block/Product/ViewTest.php | 3 +++
.../Adminhtml/Category/Widget/CategoriesJsonTest.php | 3 +++
.../Controller/Adminhtml/Category/Widget/ChooserTest.php | 3 +++
.../Magento/Catalog/Controller/Product/Compare/IndexTest.php | 3 +++
.../Magento/Catalog/Model/App/Action/ContextPluginTest.php | 2 ++
.../Model/Attribute/Backend/CustomlayoutupdateTest.php | 3 +++
.../Catalog/Model/Category/Attribute/Backend/SortbyTest.php | 3 +++
.../Catalog/Model/Category/AttributeRepositoryTest.php | 2 ++
.../testsuite/Magento/Catalog/Model/Category/TreeTest.php | 2 ++
.../unit/testsuite/Magento/Catalog/Model/CategoryTest.php | 2 ++
.../Catalog/Model/Indexer/Category/AffectCacheTest.php | 2 ++
.../Catalog/Model/Indexer/Product/AffectCacheTest.php | 2 ++
.../Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php | 2 ++
.../Catalog/Model/Indexer/Product/Flat/Action/RowTest.php | 3 +++
.../Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php | 3 +++
.../Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php | 3 +++
.../Catalog/Model/Layer/Category/AvailabilityFlagTest.php | 2 ++
.../Catalog/Model/Layer/Category/CollectionFilterTest.php | 2 ++
.../Model/Layer/Category/FilterableAttributeListTest.php | 2 ++
.../testsuite/Magento/Catalog/Model/Layer/FilterListTest.php | 2 ++
.../Model/Layer/Search/FilterableAttributeListTest.php | 2 ++
.../Magento/Catalog/Model/Layout/DepersonalizePluginTest.php | 2 ++
.../Catalog/Model/Product/Attribute/ManagementTest.php | 3 +++
.../Catalog/Model/Product/Attribute/RepositoryTest.php | 2 ++
.../Catalog/Model/Product/Attribute/Source/StatusTest.php | 2 ++
.../Catalog/Model/Product/Attribute/TypesListTest.php | 2 ++
.../Magento/Catalog/Model/Product/LinkTypeProviderTest.php | 3 +++
.../Catalog/Model/Product/Option/Validator/PoolTest.php | 2 ++
.../Magento/Catalog/Model/Product/PriceModifierTest.php | 2 ++
.../Catalog/Model/Product/TierPriceManagementTest.php | 3 +++
.../unit/testsuite/Magento/Catalog/Model/ProductTest.php | 3 +++
.../Magento/Catalog/Model/Resource/Category/TreeTest.php | 3 +++
.../Magento/Catalog/Model/Resource/Eav/AttributeTest.php | 3 +++
.../Model/Resource/Product/Attribute/Backend/MediaTest.php | 3 +++
.../Catalog/Model/Resource/Product/Option/CollectionTest.php | 3 +++
.../Magento/Catalog/Pricing/Price/BasePriceTest.php | 3 +++
.../Magento/Catalog/Pricing/Price/GroupPriceTest.php | 2 ++
.../Magento/Catalog/Pricing/Price/TierPriceTest.php | 2 ++
.../unit/testsuite/Magento/CatalogRule/Model/CronTest.php | 2 ++
.../Magento/CatalogRule/Plugin/Indexer/CategoryTest.php | 3 +++
.../Magento/CatalogRule/Plugin/Indexer/CustomerGroupTest.php | 3 +++
.../Magento/CatalogRule/Plugin/Indexer/ImportExportTest.php | 3 +++
.../Magento/CatalogRule/Plugin/Indexer/WebsiteTest.php | 3 +++
.../unit/testsuite/Magento/Checkout/Helper/CartTest.php | 3 +++
.../unit/testsuite/Magento/Checkout/Helper/DataTest.php | 3 +++
.../Checkout/Model/Layout/DepersonalizePluginTest.php | 2 ++
.../unit/testsuite/Magento/Checkout/Model/SessionTest.php | 2 ++
.../testsuite/Magento/Checkout/Model/Type/OnepageTest.php | 2 ++
.../Checkout/Service/V1/Address/Billing/WriteServiceTest.php | 2 ++
.../Magento/Checkout/Service/V1/Address/ConverterTest.php | 2 ++
.../Service/V1/Address/Shipping/WriteServiceTest.php | 2 ++
.../Magento/Checkout/Service/V1/Address/ValidatorTest.php | 2 ++
.../Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php | 2 ++
.../Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php | 2 ++
.../Magento/Checkout/Service/V1/Cart/ReadServiceTest.php | 2 ++
.../Magento/Checkout/Service/V1/Cart/TotalsServiceTest.php | 3 +++
.../Magento/Checkout/Service/V1/Cart/WriteServiceTest.php | 3 +++
.../Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php | 2 ++
.../Magento/Checkout/Service/V1/Coupon/WriteServiceTest.php | 2 ++
.../Service/V1/Data/Cart/ShippingMethodConverterTest.php | 2 ++
.../Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php | 2 ++
.../Magento/Checkout/Service/V1/Item/ReaderServiceTest.php | 2 ++
.../Checkout/Service/V1/PaymentMethod/ReadServiceTest.php | 2 ++
.../Checkout/Service/V1/PaymentMethod/WriteServiceTest.php | 2 ++
.../Model/Export/RowCustomizerTest.php | 3 +++
.../Magento/ConfigurableProduct/Helper/DataTest.php | 3 +++
.../Model/Product/Type/ConfigurableTest.php | 3 +++
.../ConfigurableProduct/Model/Product/Type/PluginTest.php | 3 +++
.../Initializer/Option/Plugin/ConfigurableProductTest.php | 3 +++
.../ConfigurableProduct/Model/SuggestedAttributeListTest.php | 3 +++
.../testsuite/Magento/Contact/Controller/Index/IndexTest.php | 3 +++
.../unit/testsuite/Magento/Contact/Controller/IndexTest.php | 2 ++
dev/tests/unit/testsuite/Magento/Contact/Helper/DataTest.php | 2 ++
.../testsuite/Magento/Core/App/Router/NoRouteHandlerTest.php | 3 +++
dev/tests/unit/testsuite/Magento/Core/Helper/ThemeTest.php | 3 +++
.../unit/testsuite/Magento/Core/Model/App/EmulationTest.php | 3 +++
.../unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php | 3 +++
.../Magento/Core/Model/Asset/Plugin/CleanMergedJsCssTest.php | 3 +++
.../Magento/Core/Model/Layout/DepersonalizePluginTest.php | 2 ++
.../testsuite/Magento/Core/Model/Theme/Image/PathTest.php | 2 ++
.../unit/testsuite/Magento/Core/Model/View/DesignTest.php | 3 +++
.../Magento/Customer/Block/Account/Dashboard/InfoTest.php | 3 +++
.../Customer/Block/Adminhtml/Edit/Tab/AccountTest.php | 2 ++
.../unit/testsuite/Magento/Customer/Block/Widget/DobTest.php | 3 +++
.../testsuite/Magento/Customer/Block/Widget/GenderTest.php | 3 +++
.../testsuite/Magento/Customer/Block/Widget/NameTest.php | 3 +++
.../testsuite/Magento/Customer/Block/Widget/TaxvatTest.php | 3 +++
.../Magento/Customer/Controller/Account/ConfirmTest.php | 2 ++
.../Magento/Customer/Controller/Account/CreatePostTest.php | 3 +++
.../Magento/Customer/Controller/Account/CreateTest.php | 3 +++
.../Controller/Adminhtml/Index/ResetPasswordTest.php | 3 +++
.../testsuite/Magento/Customer/Controller/Ajax/LoginTest.php | 2 ++
.../Magento/Customer/Helper/Session/CurrentCustomerTest.php | 3 +++
.../Magento/Customer/Model/Resource/AddressTest.php | 2 ++
.../testsuite/Magento/Customer/Model/Resource/GroupTest.php | 2 ++
.../Model/Import/CustomerCompositeTest.php | 3 +++
.../CustomerImportExport/Model/Import/CustomerTest.php | 2 ++
.../DesignEditor/Controller/Varien/Router/StandardTest.php | 3 +++
.../Directory/Model/Resource/Country/CollectionTest.php | 3 +++
.../Magento/Eav/Model/Attribute/Data/AbstractDataTest.php | 3 +++
.../testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php | 3 +++
.../testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php | 3 +++
.../testsuite/Magento/Eav/Model/AttributeManagementTest.php | 2 ++
.../Eav/Model/Entity/Attribute/Source/BooleanTest.php | 3 +++
.../Magento/Eav/Model/Resource/Attribute/CollectionTest.php | 3 +++
.../Magento/Eav/Model/Resource/Entity/AttributeTest.php | 3 +++
.../Eav/Plugin/Model/Resource/Entity/AttributeTest.php | 2 ++
.../Magento/Email/Block/Adminhtml/Template/PreviewTest.php | 3 +++
.../testsuite/Magento/Framework/App/Action/ActionTest.php | 2 ++
.../unit/testsuite/Magento/Framework/App/AreaListTest.php | 3 +++
.../unit/testsuite/Magento/Framework/App/BootstrapTest.php | 2 ++
.../Magento/Framework/App/ObjectManager/ConfigLoaderTest.php | 3 +++
.../testsuite/Magento/Framework/App/Request/HttpTest.php | 3 +++
.../unit/testsuite/Magento/Framework/App/ResourceTest.php | 2 ++
.../testsuite/Magento/Framework/App/StaticResourceTest.php | 3 +++
.../Magento/Framework/Autoload/ClassLoaderWrapperTest.php | 3 +++
.../unit/testsuite/Magento/Framework/Cache/CoreTest.php | 2 ++
.../Code/Reader/_files/ClassesForArgumentsReader.php | 3 +++
.../Code/Validator/_files/ClassesForArgumentSequence.php | 3 +++
.../Code/Validator/_files/ClassesForConstructorIntegrity.php | 3 +++
.../Code/Validator/_files/ClassesForContextAggregation.php | 3 +++
.../Code/Validator/_files/ClassesForTypeDuplication.php | 3 +++
.../Magento/Framework/Config/Composer/PackageTest.php | 2 ++
.../unit/testsuite/Magento/Framework/Config/DataTest.php | 3 +++
.../testsuite/Magento/Framework/DB/AbstractMapperTest.php | 3 +++
.../testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php | 2 ++
.../testsuite/Magento/Framework/Data/Collection/DbTest.php | 3 +++
.../Framework/Data/Form/Element/AbstractElementTest.php | 2 ++
dev/tests/unit/testsuite/Magento/Framework/File/CsvTest.php | 2 ++
.../Interception/Code/Generator/InterceptorTest.php | 2 ++
.../Framework/Interception/Code/InterfaceValidatorTest.php | 2 ++
.../Model/InterfaceValidator/ItemPlugin/ExtraParameters.php | 3 +++
.../ItemPlugin/IncompatibleArgumentsCount.php | 3 +++
.../ItemPlugin/IncompatibleArgumentsType.php | 3 +++
.../Model/InterfaceValidator/ItemPlugin/InvalidProceed.php | 3 +++
.../Model/InterfaceValidator/ItemPlugin/ValidPlugin.php | 3 +++
.../testsuite/Magento/Framework/Less/FileGeneratorTest.php | 2 ++
.../Framework/Less/PreProcessor/Instruction/ImportTest.php | 2 ++
.../Less/PreProcessor/Instruction/MagentoImportTest.php | 2 ++
.../unit/testsuite/Magento/Framework/Locale/ConfigTest.php | 2 ++
.../unit/testsuite/Magento/Framework/Locale/CurrencyTest.php | 2 ++
.../Magento/Framework/Model/Resource/Db/AbstractDbTest.php | 2 ++
.../Model/Resource/Db/Collection/AbstractCollectionTest.php | 2 ++
.../Magento/Framework/Mview/Config/Data/ProxyTest.php | 3 +++
.../unit/testsuite/Magento/Framework/Mview/ConfigTest.php | 3 +++
.../Magento/Framework/Mview/View/CollectionTest.php | 3 +++
.../Magento/Framework/Mview/View/SubscriptionFactoryTest.php | 3 +++
.../Magento/Framework/Mview/View/SubscriptionTest.php | 3 +++
.../ObjectManager/Config/Reader/_files/ConfigDomMock.php | 2 ++
.../Magento/Framework/Phrase/Renderer/CompositeTest.php | 3 +++
.../unit/testsuite/Magento/Framework/Session/ConfigTest.php | 2 ++
dev/tests/unit/testsuite/Magento/Framework/ShellTest.php | 3 +++
.../Magento/Framework/Stdlib/Cookie/CookieScopeTest.php | 2 ++
.../Magento/Framework/Stdlib/Cookie/PhpCookieManagerTest.php | 2 ++
dev/tests/unit/testsuite/Magento/Framework/UrlTest.php | 2 ++
.../testsuite/Magento/Framework/ValidatorFactoryTest.php | 3 +++
.../testsuite/Magento/Framework/View/Asset/MergedTest.php | 3 +++
.../Framework/View/Asset/ModuleNotation/ResolverTest.php | 2 ++
.../Framework/View/Asset/PreProcessor/ModuleNotationTest.php | 2 ++
.../Magento/Framework/View/Asset/RepositoryTest.php | 2 ++
.../testsuite/Magento/Framework/View/Asset/SourceTest.php | 2 ++
.../unit/testsuite/Magento/Framework/View/BlockPoolTest.php | 2 ++
.../testsuite/Magento/Framework/View/DataSourcePoolTest.php | 2 ++
.../Design/FileResolution/Fallback/CacheData/FlatTest.php | 2 ++
.../Design/FileResolution/Fallback/CacheData/GroupedTest.php | 2 ++
.../FileResolution/Fallback/Resolver/AlternativeTest.php | 2 ++
.../Design/FileResolution/Fallback/Resolver/SimpleTest.php | 2 ++
.../Magento/Framework/View/Design/Theme/ImageTest.php | 2 ++
.../View/File/Collector/Decorator/ModuleDependencyTest.php | 2 ++
.../View/File/Collector/Decorator/ModuleOutputTest.php | 2 ++
.../Framework/View/File/Collector/Override/BaseTest.php | 2 ++
.../View/File/Collector/Override/ThemeModularTest.php | 2 ++
.../testsuite/Magento/Framework/View/File/FileListTest.php | 2 ++
.../unit/testsuite/Magento/Framework/View/FileSystemTest.php | 2 ++
.../Magento/Framework/View/Layout/Reader/MoveTest.php | 2 ++
.../testsuite/Magento/Framework/View/Result/LayoutTest.php | 2 ++
.../Framework/View/TemplateEngine/_files/simple.phtml | 3 +++
.../Magento/GiftMessage/Model/GiftMessageManagerTest.php | 2 ++
.../Magento/GiftMessage/Model/Type/Plugin/OnepageTest.php | 2 ++
.../Magento/GiftMessage/Service/V1/ReadServiceTest.php | 2 ++
.../Magento/Indexer/Model/Processor/InvalidateCacheTest.php | 2 ++
.../Controller/Adminhtml/Integration/DeleteTest.php | 3 +++
.../Controller/Adminhtml/Integration/EditTest.php | 3 +++
.../Controller/Adminhtml/Integration/NewActionTest.php | 3 +++
.../Adminhtml/Integration/PermissionsDialogTest.php | 3 +++
.../Controller/Adminhtml/Integration/SaveTest.php | 3 +++
.../Controller/Adminhtml/Integration/TokensDialogTest.php | 3 +++
.../unit/testsuite/Magento/Integration/Oauth/OauthTest.php | 3 +++
.../Magento/Integration/Service/V1/AdminTokenServiceTest.php | 2 ++
dev/tests/unit/testsuite/Magento/Msrp/Helper/DataTest.php | 2 ++
.../Multishipping/Block/Checkout/Address/SelectTest.php | 3 +++
.../Magento/Multishipping/Block/Checkout/OverviewTest.php | 2 ++
.../Multishipping/Block/Checkout/Payment/InfoTest.php | 2 ++
.../Magento/Multishipping/Block/Checkout/ShippingTest.php | 2 ++
.../Magento/Multishipping/Block/Checkout/StateTest.php | 2 ++
.../Magento/Multishipping/Block/Checkout/SuccessTest.php | 2 ++
.../Controller/Checkout/Address/EditAddressTest.php | 3 +++
.../Controller/Checkout/Address/EditBillingTest.php | 3 +++
.../Controller/Checkout/Address/EditShippingTest.php | 3 +++
.../Controller/Checkout/Address/NewBillingTest.php | 3 +++
.../Controller/Checkout/Address/NewShippingTest.php | 3 +++
.../Magento/Newsletter/Controller/Manage/SaveTest.php | 3 +++
.../testsuite/Magento/PageCache/Controller/Block/EsiTest.php | 3 +++
.../Magento/PageCache/Controller/Block/RenderTest.php | 2 ++
.../PageCache/Model/Controller/Result/BuiltinPluginTest.php | 3 +++
.../Magento/PageCache/Model/Observer/FlushAllCacheTest.php | 3 +++
.../PageCache/Model/Observer/FlushCacheByTagsTest.php | 3 +++
.../Model/Observer/ProcessLayoutRenderElementTest.php | 3 +++
dev/tests/unit/testsuite/Magento/Payment/Block/FormTest.php | 3 +++
.../Magento/Payment/Block/Info/SubstitutionTest.php | 2 ++
.../Magento/Payment/Model/Config/Source/AllmethodsTest.php | 2 ++
.../unit/testsuite/Magento/Payment/Model/ConfigTest.php | 2 ++
.../unit/testsuite/Magento/Payment/Model/MethodListTest.php | 2 ++
.../Model/Observer/ApplyBlockPersistentDataTest.php | 3 +++
.../Persistent/Model/Observer/RemovePersistentCookieTest.php | 2 ++
.../Persistent/Model/Observer/UpdateCustomerCookiesTest.php | 3 +++
.../testsuite/Magento/Persistent/Model/QuoteManagerTest.php | 2 ++
.../Resource/Report/Collection/AbstractCollectionTest.php | 5 ++++-
.../Magento/Review/Controller/Adminhtml/Product/PostTest.php | 2 ++
.../unit/testsuite/Magento/Rss/Model/RssManagerTest.php | 2 ++
.../unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php | 2 ++
.../Rule/Model/Condition/Product/AbstractProductTest.php | 2 ++
.../Sales/Block/Adminhtml/Order/Create/Items/GridTest.php | 3 +++
.../Sales/Block/Adminhtml/Order/Create/TotalsTest.php | 3 +++
.../Sales/Block/Order/Email/Items/DefaultItemsTest.php | 3 +++
.../Sales/Block/Order/Email/Items/Order/DefaultOrderTest.php | 3 +++
.../Sales/Block/Order/Item/Renderer/DefaultRendererTest.php | 3 +++
.../Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php | 3 +++
.../Magento/Sales/Helper/Quote/Item/CompareTest.php | 2 ++
.../testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php | 3 +++
.../Magento/Sales/Model/Grid/Child/CollectionUpdaterTest.php | 2 ++
.../Magento/Sales/Model/Grid/CollectionUpdaterTest.php | 2 ++
.../Sales/Model/Observer/Backend/CustomerQuoteTest.php | 3 +++
.../Observer/Frontend/Quote/Address/CollectTotalsTest.php | 3 +++
.../Magento/Sales/Model/Order/Creditmemo/Total/TaxTest.php | 3 +++
.../testsuite/Magento/Sales/Model/Order/CreditmemoTest.php | 3 +++
.../Magento/Sales/Model/Order/Invoice/Total/ShippingTest.php | 3 +++
.../unit/testsuite/Magento/Sales/Model/Order/InvoiceTest.php | 3 +++
.../unit/testsuite/Magento/Sales/Model/Quote/AddressTest.php | 3 +++
.../unit/testsuite/Magento/Sales/Model/Quote/ItemTest.php | 3 +++
dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php | 3 +++
.../testsuite/Magento/Sales/Model/Resource/GridPoolTest.php | 3 +++
.../Magento/Sales/Model/Resource/Order/StatusTest.php | 3 +++
.../SalesRule/Model/Resource/Report/CollectionTest.php | 3 +++
.../Controller/Adminhtml/Order/Shipment/AddTrackTest.php | 2 ++
.../Controller/Adminhtml/Order/Shipment/SaveTest.php | 2 ++
.../unit/testsuite/Magento/Shipping/Model/ShipmentTest.php | 2 ++
.../Magento/Store/App/Action/Plugin/ContextTest.php | 2 ++
.../Magento/Store/App/Action/Plugin/StoreCheckTest.php | 3 +++
.../Magento/Store/Model/Config/Reader/ReaderPoolTest.php | 3 +++
.../unit/testsuite/Magento/Store/Model/Storage/DbTest.php | 3 +++
dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php | 3 +++
.../Magento/Tax/Block/Checkout/Cart/Sidebar/TotalsTest.php | 3 +++
dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php | 3 +++
.../Calculation/RowBaseAndTotalBaseCalculatorTestCase.php | 2 ++
.../unit/testsuite/Magento/Tax/Model/Config/TaxClassTest.php | 2 ++
dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php | 2 ++
.../Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php | 3 +++
.../Magento/Tax/Model/Sales/Total/Quote/ShippingTest.php | 3 +++
.../Magento/Tax/Model/Sales/Total/Quote/TaxTest.php | 3 +++
.../Block/Adminhtml/System/Design/Theme/Tab/CssTest.php | 3 +++
.../Magento/Theme/Model/Url/Plugin/SignatureTest.php | 2 ++
.../Magento/Tools/Di/Compiler/ArgumentsResolverTest.php | 3 +++
.../testsuite/Magento/Tools/Di/Definition/CollectionTest.php | 3 +++
.../unit/testsuite/Magento/Tools/I18n/Parser/ParserTest.php | 3 +++
.../Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php | 2 ++
.../Magento/UrlRewrite/Model/Storage/DbStorageTest.php | 3 +++
.../unit/testsuite/Magento/Webapi/Controller/RestTest.php | 3 +++
.../Magento/Webapi/Controller/Soap/Request/HandlerTest.php | 3 +++
.../unit/testsuite/Magento/Webapi/_files/test_interfaces.php | 3 +++
.../Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php | 2 ++
.../unit/testsuite/Magento/Weee/Pricing/AdjustmentTest.php | 2 ++
.../testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php | 2 ++
lib/internal/Magento/Framework/Acl/Resource/Provider.php | 3 +++
lib/internal/Magento/Framework/Archive/Helper/File.php | 2 ++
lib/internal/Magento/Framework/Archive/Helper/File/Gz.php | 2 ++
lib/internal/Magento/Framework/Backup/Archive/Tar.php | 2 ++
lib/internal/Magento/Framework/Backup/Db/BackupFactory.php | 3 +++
lib/internal/Magento/Framework/Backup/Factory.php | 3 +++
lib/internal/Magento/Framework/Backup/Filesystem.php | 3 +++
lib/internal/Magento/Framework/Cache/Backend/Database.php | 2 ++
.../Magento/Framework/Cache/Backend/Eaccelerator.php | 3 +++
lib/internal/Magento/Framework/Config/Dom.php | 2 ++
lib/internal/Magento/Framework/CurrencyFactory.php | 3 +++
lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 3 +++
lib/internal/Magento/Framework/DB/MapperFactory.php | 2 ++
lib/internal/Magento/Framework/DB/QueryFactory.php | 3 +++
lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php | 2 ++
lib/internal/Magento/Framework/Data/Form/Element/Editor.php | 3 +++
lib/internal/Magento/Framework/Data/Form/Element/Gallery.php | 2 ++
lib/internal/Magento/Framework/Data/Form/Element/Time.php | 2 ++
lib/internal/Magento/Framework/Data/FormFactory.php | 3 +++
lib/internal/Magento/Framework/Encryption/Crypt.php | 3 +++
.../Magento/Framework/Event/Invoker/InvokerDefault.php | 3 +++
lib/internal/Magento/Framework/File/Csv.php | 3 +++
lib/internal/Magento/Framework/File/CsvMulty.php | 2 ++
.../Magento/Framework/File/Transfer/Adapter/Http.php | 2 ++
.../Magento/Framework/Filter/Input/MaliciousCode.php | 3 +++
.../Magento/Framework/Gdata/Gshopping/HttpException.php | 3 +++
lib/internal/Magento/Framework/HTTP/Adapter/Curl.php | 2 ++
lib/internal/Magento/Framework/HTTP/Header.php | 3 +++
lib/internal/Magento/Framework/Image/Factory.php | 3 +++
.../Framework/Interception/Code/Generator/Interceptor.php | 3 +++
lib/internal/Magento/Framework/Io/Sftp.php | 3 +++
.../Framework/Less/PreProcessor/Instruction/Import.php | 2 ++
lib/internal/Magento/Framework/Locale/Lists.php | 3 +++
.../Magento/Framework/Mail/Template/TransportBuilder.php | 3 +++
lib/internal/Magento/Framework/Message/Factory.php | 3 +++
.../Magento/Framework/Model/Resource/AbstractResource.php | 3 +++
.../Model/Resource/Db/Collection/AbstractCollection.php | 3 +++
.../Magento/Framework/Model/Resource/Type/Db/Pdo/Mysql.php | 3 +++
.../Magento/Framework/Module/Plugin/DbStatusValidator.php | 3 +++
lib/internal/Magento/Framework/Module/Resource.php | 3 +++
.../Magento/Framework/Module/Setup/MigrationFactory.php | 3 +++
lib/internal/Magento/Framework/Mview/ActionFactory.php | 3 +++
lib/internal/Magento/Framework/Mview/View.php | 3 +++
lib/internal/Magento/Framework/Mview/View/Subscription.php | 3 +++
.../Framework/ObjectManager/Code/Generator/Persistor.php | 3 +++
.../Framework/ObjectManager/Code/Generator/Repository.php | 3 +++
.../Magento/Framework/ObjectManager/DefinitionFactory.php | 3 +++
.../Magento/Framework/Pricing/Render/RendererPool.php | 3 +++
lib/internal/Magento/Framework/Profiler/Driver/Factory.php | 3 +++
.../Magento/Framework/Stdlib/DateTime/DateInterface.php | 3 +++
.../Magento/Framework/Stdlib/DateTime/TimezoneInterface.php | 3 +++
lib/internal/Magento/Framework/Translate/Adapter.php | 2 ++
.../Magento/Framework/Translate/AdapterInterface.php | 2 ++
lib/internal/Magento/Framework/Translate/Inline.php | 3 +++
lib/internal/Magento/Framework/Url.php | 2 ++
lib/internal/Magento/Framework/UrlFactory.php | 3 +++
lib/internal/Magento/Framework/Validator/Builder.php | 3 +++
.../Magento/Framework/Validator/Constraint/Property.php | 3 +++
.../Magento/Framework/Validator/ConstraintFactory.php | 2 ++
1442 files changed, 3980 insertions(+), 9 deletions(-)
mode change 100755 => 100644 dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
mode change 100755 => 100644 dev/tests/integration/testsuite/Magento/Customer/Controller/AjaxLoginTest.php
diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index baa57d81bab..d0e9f207ed4 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\AdminNotification\Block\Grid\Renderer;
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
diff --git a/app/code/Magento/AdminNotification/Block/ToolbarEntry.php b/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
index 30d2793ef9d..f7c604d0d84 100644
--- a/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
+++ b/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\AdminNotification\Block;
/**
diff --git a/app/code/Magento/AdminNotification/Model/Resource/Grid/Collection.php b/app/code/Magento/AdminNotification/Model/Resource/Grid/Collection.php
index 33880cfb708..242cb283bcc 100644
--- a/app/code/Magento/AdminNotification/Model/Resource/Grid/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/Resource/Grid/Collection.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* AdminNotification Inbox model
*
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
index e8041a763ce..d168b9037bd 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\AdminNotification\Model\System\Message;
class Baseurl implements \Magento\Framework\Notification\MessageInterface
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
index cdec54248b8..03b2ff284af 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
index f7e44190cb0..99b6868f6cd 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\AdminNotification\Model\System\Message;
class Security implements \Magento\Framework\Notification\MessageInterface
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
index f18d2b5cbd7..90f09911356 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
index 482c38a1fdc..5e3593b8b48 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\AdminNotification\Block\System\Messages */ ?>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
index c384f2a10ed..bf9d006c7f7 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
<div id="system_messages_list" title="<?php echo $this->escapeHtml($this->getPopupTitle()); ?>">
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
index 8ffdbd265e0..dd880fa47c6 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\AdminNotification\Block\ToolbarEntry */ ?>
<?php $notificationCount = $this->getUnreadNotificationCount(); ?>
diff --git a/app/code/Magento/Authorization/Model/Resource/Rules.php b/app/code/Magento/Authorization/Model/Resource/Rules.php
index d1f16dbe54a..8ade47a994e 100644
--- a/app/code/Magento/Authorization/Model/Resource/Rules.php
+++ b/app/code/Magento/Authorization/Model/Resource/Rules.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Authorization\Model\Resource;
/**
diff --git a/app/code/Magento/Backend/App/Config.php b/app/code/Magento/Backend/App/Config.php
index f4fb4115773..ab9f053b99f 100644
--- a/app/code/Magento/Backend/App/Config.php
+++ b/app/code/Magento/Backend/App/Config.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\App;
/**
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
index 2f59e29741b..e61baaebd90 100644
--- a/app/code/Magento/Backend/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block;
class Dashboard extends \Magento\Backend\Block\Template
diff --git a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
index 43f034166cf..f6e55363ec6 100644
--- a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Dashboard;
/**
diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
index b77cb7c86c4..7413dc5c7a8 100644
--- a/app/code/Magento/Backend/Block/Menu.php
+++ b/app/code/Magento/Backend/Block/Menu.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block;
/**
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
index 39574f1ec15..08ed3799f85 100644
--- a/app/code/Magento/Backend/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Page;
/**
diff --git a/app/code/Magento/Backend/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php
index 20d8be4eaf0..b7e5cb9c716 100644
--- a/app/code/Magento/Backend/Block/Page/Notices.php
+++ b/app/code/Magento/Backend/Block/Page/Notices.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Adminhtml header notices block
*
diff --git a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
index 4ce47621586..867f138c7f4 100644
--- a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
+++ b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Page\System\Config\Robots;
/**
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
index a983e672e09..dc4a2e0abbd 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Store\Switcher\Form\Renderer;
/**
diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Field.php b/app/code/Magento/Backend/Block/System/Config/Form/Field.php
index f97740950c7..91415bce932 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form/Field.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form/Field.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Abstract config form element renderer
*
diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Backend/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
index c853eabc971..e07c3d0ebeb 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\System\Config\Form\Field\FieldArray;
/**
diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/Magento/Backend/Block/System/Config/Form/Field/Select/Allowspecific.php
index efd49c62846..ae28b64a469 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form/Field/Select/Allowspecific.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form/Field/Select/Allowspecific.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* System configuration shipping methods allow all countries select
*
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
index 1b2a4d61960..239dc7d2cc2 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\System\Design\Edit\Tab;
class General extends \Magento\Backend\Block\Widget\Form\Generic
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
index 70fbebbb72b..f7e17e2f8c5 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Form\Element;
use Magento\Framework\Data\Form\Element\AbstractElement;
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php
index 028e461fc1c..c7819085ba9 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Form\Renderer;
use Magento\Framework\Data\Form\Element\AbstractElement;
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php
index 230557518ce..d073b6e758a 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Form\Renderer;
use Magento\Framework\Data\Form\Element\AbstractElement;
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php
index 66953aae94e..6913efdc479 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Form\Renderer\Fieldset;
use Magento\Framework\Data\Form\Element\AbstractElement;
diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
index f089a3e0603..d0195ea6753 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget;
/**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
index 239c649110e..f7fdad4c65c 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Grid\Column\Filter;
/**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
index 47f5e07ccc0..3ea080c4876 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Grid\Column\Filter;
/**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index 33630b4a59a..45e03bd1d90 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
/**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
index 076ff34ceda..c479c14c770 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
/**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Export.php b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
index 5ec6857e3ab..6ad2a1b2b7d 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Export.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Grid;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
index 92e18a9b7c7..18eba24c23a 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Controller\Adminhtml\System;
use Magento\Backend\App\Action;
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Currency/Base.php b/app/code/Magento/Backend/Model/Config/Backend/Currency/Base.php
index 930f2655009..212d6c5abfe 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Currency/Base.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Currency/Base.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Backend Directory currency backend model
* Allows dispatching before and after events for each controller action
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Email/Sender.php b/app/code/Magento/Backend/Model/Config/Backend/Email/Sender.php
index 0a670a2ca9f..b6d06614896 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Email/Sender.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Email/Sender.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* System config email sender field backend model
*/
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Encrypted.php b/app/code/Magento/Backend/Model/Config/Backend/Encrypted.php
index ca827699e2f..464cc4a897a 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Encrypted.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Encrypted.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Config\Backend;
class Encrypted extends \Magento\Framework\App\Config\Value implements \Magento\Framework\App\Config\Data\ProcessorInterface
diff --git a/app/code/Magento/Backend/Model/Config/Source/Dev/Dbautoup.php b/app/code/Magento/Backend/Model/Config/Source/Dev/Dbautoup.php
index 5ee09db4892..ded1c1b303b 100644
--- a/app/code/Magento/Backend/Model/Config/Source/Dev/Dbautoup.php
+++ b/app/code/Magento/Backend/Model/Config/Source/Dev/Dbautoup.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Config\Source\Dev;
class Dbautoup implements \Magento\Framework\Option\ArrayInterface
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
index ec69736a687..9d79c743406 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Config\Structure\Element;
class Group extends AbstractComposite
diff --git a/app/code/Magento/Backend/Model/Menu/Director/Director.php b/app/code/Magento/Backend/Model/Menu/Director/Director.php
index 0d77330ecb0..c1178d64e3d 100644
--- a/app/code/Magento/Backend/Model/Menu/Director/Director.php
+++ b/app/code/Magento/Backend/Model/Menu/Director/Director.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Menu\Director;
class Director extends \Magento\Backend\Model\Menu\AbstractDirector
diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
index 8091747ede2..a98a0083320 100644
--- a/app/code/Magento/Backend/Model/Menu/Item.php
+++ b/app/code/Magento/Backend/Model/Menu/Item.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Menu;
/**
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
index c9aaee12553..bb6d1f32148 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Widget\Grid;
abstract class AbstractTotals implements \Magento\Backend\Model\Widget\Grid\TotalsInterface
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
index d2f903e71e5..da046cab059 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
index 676d6c743d6..dc44ab9062f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div id="page-login" class="page-login">
<div class="wrapper">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
index 0bd8eefc84f..c0fbf4f4bd4 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="wrapper-popup">
<div class="middle" id="anchor-content">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
index e6edc5b0cf4..1e54ab6a51d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Backend\Block\Page */ ?>
<!doctype html>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
index e92e7d5af95..8c5061a48e8 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="dashboard-diagram">
<div class="dashboard-diagram-switcher">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
index 5589f4668f5..285d35dabb2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
index 3510a20e8e9..8979c49491f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (is_array($this->getChildBlock('diagrams')->getTabsIds())) : ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
index 6ccae935bf4..d802f74c96c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (sizeof($this->getTotals()) > 0): ?>
<?php foreach ($this->getTotals() as $_total): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
index 5ba7b3b433d..09f2361be1b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div style="padding:5px;">
<?php if (count($this->getCollection()->getItems()) > 0): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
index ba4ac800ce3..92ea01998b1 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<p class="switcher"><label for="store_switcher"><?php echo __('View Statistics For:') ?></label>
<?php echo $this->getHintHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
index 09cfb73dc0d..a2c954377ec 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (sizeof($this->getTotals()) > 0): ?>
<div class="dashboard-totals" id="dashboard_diagram_totals">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
index cd0b34cb15b..83b5e3cac18 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<nav class="navigation">
<?php echo $this->renderNavigation($this->getMenuModel(), 0, 12); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
index f159b628c76..d4ee283c310 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<small class="copyright">
<?php echo __('Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.', date('Y')) ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
index a3b87f4c6a4..5304ea03103 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<small class="magento-version"><?php echo __('Magento ver. %1', \Magento\Framework\AppInterface::VERSION) ?></small>
<?php if ($this->getBugreportUrl()): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
index 5dbde87fe5e..8fe9c65b58d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Backend\Block\Page\Header */
?>
<?php switch ($this->getShowPart()):
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
index c3d65413e27..c364e6f5940 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml
index a99050ebce2..516c2d3185f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml
index 44628b3d318..3e0270d06cc 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="locale-switcher-field field">
<label class="label" for="locale-switcher"><span><?php echo __('Interface Locale'); ?></span></label>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml
index 3a8f3eb0e95..c0ff697acae 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/system/config/robots/reset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/system/config/robots/reset.phtml
index 2988aabd9cf..d3d44e7e9d2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/system/config/robots/reset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/system/config/robots/reset.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Backend\Block\Page\System\Config\Robots\Reset
* @var $coreHelper \Magento\Core\Helper\Data
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
index e4d496a5ce8..43a9bbca075 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getChildHtml()):?>
<div class="page-actions" <?php echo $this->getUiId('content-header') ?>>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index 4b776da1be1..6831eec8d99 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Backend\Block\Store\Switcher */
?>
<?php if ($websites = $this->getWebsites()): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
index 1fe73942204..30ed99515a7 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_element = $this->getElement() ?>
<?php if ($_element->getFieldsetContainerId()): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
index d0b34c26af3..3f32e240828 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/* @var $this \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
index d66de1b3478..f7b47860fb7 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<ul class="dropdown-menu">
<?php foreach ($items as $item): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
index 72deaa09a1a..904094a6bce 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
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 a043f39c7c2..8c1d2785729 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/form/field/array.phtml
index 74729edf5fa..f607771dc6f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/form/field/array.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/js.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/js.phtml
index 016997793c8..e1d1f6e5289 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/js.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/js.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
//<![CDATA[
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml
index 31913887f3e..b132922b85a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Backend\Block\Template */ ?>
<div class="field field-store-switcher">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
index 3a3986d3bc4..53a9097390e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Backend\Block\System\Config\System\Storage\Media\Synchronize */ ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/tabs.phtml
index 89a431fb85a..776a7556d69 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/tabs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/tabs.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Backend\Block\System\Config\Tabs */
?>
<?php if ($this->getTitle()): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml
index d446e7eaee5..26850ee918e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
index 2f662fdf4df..00bd42d4e27 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Backend\Block\GlobalSearch */
?>
<div class="search-global miniform">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
index 74304aff6d3..68f35e9e196 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
index ab661716c0b..6c29f19b652 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (!empty($links)): ?>
<ul class="breadcrumbs">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
index f3ec6cd5578..24610de7c1c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
index 28124fa057a..a5b8a5b7e38 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var $this \Magento\Backend\Block\Widget\Button\SplitButton */
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
index a31be4d4715..c1b0ae3c8f5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Backend\Block\Widget\Form */
?>
<?php /* @todo replace .form-inline with better class name */?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
index f8b5bc88e0a..598d5b41b98 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Backend\Block\Widget\Form\Container */
?>
<?php echo $this->getFormInitScripts() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
index bbf25aa6d1b..52db4120fa1 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php switch ($element->getType()) {
case 'fieldset': ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
index af44009869f..61a8d45c836 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<tr>
<td colspan="2">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml
index 425cb215d06..90d8e9d094a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_element = $this->getElement() ?>
<?php if ($_element->getNoSpan() !== true): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
index 0cfb8087247..0ccf78a0171 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var $element \Magento\Framework\Data\Form\Element\Fieldset */
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
index 5d9dbcfde5e..c35963ae88a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/* @var $this \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index dbd268eba23..1e2aa1a3418 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
index 0bc71362345..e7a5e2f5151 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml
index 983a87fd0d1..d80c81a51ab 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getButtonsHtml()): ?>
<div class="page-actions"><?php echo $this->getButtonsHtml() ?></div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml
index af3dfe91251..150772e9391 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getGridHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
index 1d9ce337a1f..b0132ce9658 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<label for="<?php echo $this->getId() ?>_export" class="label">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 6d1992849b9..7695ba3445e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
index eb14158f785..92cde7496b8 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div id="<?php echo $this->getHtmlId() ?>">
<div class="massaction">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
index 9f251e539d3..6e151dd07d8 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @deprecated support Magento 1.x grid massaction implementation
*/
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
index 9ed8467ac1f..b2803d5c873 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
index 2e7b52e59b2..d7249c2eaf5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Backend\Block\Widget\Tabs */
?>
<?php if (!empty($tabs)): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
index 51be2598ad0..4737be64f14 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<!-- <?php if ($this->getTitle()): ?>
<h3><?php echo $this->getTitle() ?></h3>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml
index 47cefba32fc..e6087d06dad 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<dl id="dl-<?php echo $id ?>" class="accordion">
<?php foreach ($sections as $sectionId => $section): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml
index c7c2f9e62a4..e4403b32832 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="page-actions"><?php echo $this->getButtonsHtml() ?></div>
<?php echo $this->getViewHtml() ?>
diff --git a/app/code/Magento/Backend/view/install/templates/page/copyright.phtml b/app/code/Magento/Backend/view/install/templates/page/copyright.phtml
index a815a6e0a82..4ecfdda83b8 100644
--- a/app/code/Magento/Backend/view/install/templates/page/copyright.phtml
+++ b/app/code/Magento/Backend/view/install/templates/page/copyright.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo __('Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.', date('Y')) ?>
diff --git a/app/code/Magento/Backup/Model/Resource/Helper.php b/app/code/Magento/Backup/Model/Resource/Helper.php
index a2e8c11c931..230615e1df3 100644
--- a/app/code/Magento/Backup/Model/Resource/Helper.php
+++ b/app/code/Magento/Backup/Model/Resource/Helper.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backup\Model\Resource;
class Helper extends \Magento\Framework\DB\Helper
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
index f8be02c6c7a..4e6c669d1d9 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<!-- TODO: refactor form styles and js -->
<div class="fade backup-dialog" id="rollback-warning" style="display: none;">
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
index 4890801d06c..a3b9a3914db 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml('grid') ?>
<?php echo $this->getGridHtml() ?>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
index 46398975c1e..0463025dcd3 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab;
/**
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 5b33daae698..fa1c03557ce 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
use Magento\Bundle\Model\Product\Price;
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index b4d55aeaf03..0a4d6b5ad58 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Model\Product;
use Magento\Catalog\Api\ProductRepositoryInterface;
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
index 6ee362083a2..cebcbdca199 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Model\Sales\Order\Pdf\Items;
/**
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
index 0dd8f47a45b..17e2d92d6b4 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle */ ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
index e0279995200..35ded4722e6 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Checkbox */ ?>
<?php $_option = $this->getOption(); ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
index bdcb14c80da..d89b7bd1648 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Multi */ ?>
<?php $_option = $this->getOption(); ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
index c532c260a86..7ff5ed32228 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Radio */ ?>
<?php $_option = $this->getOption(); ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
index b45d981208d..85c4547b905 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select */ ?>
<?php $_option = $this->getOption(); ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
index a1fd8483e06..d93b48fabef 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle */
?>
<script type="text/javascript">
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 766cfdb8d4a..778654be471 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
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option */
?>
<script id="bundle-option-template" type="text/x-jquery-tmpl">
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
index da53c811c3d..e63a8d0e95f 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection */
?>
<script id="bundle-option-selection-box-template" type="text/x-jquery-tmpl">
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
index 5d1546a0df4..b0416116999 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
index 8c67f2dc070..38b53ce60bf 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
index fa85a07d579..bfc0b754349 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
index f3c032c5655..7ab0c1b6505 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index 29db5b5ff2b..61b24d168ef 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
index 8ad4f69c737..ab052a6a6e4 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
index d8476a41d4b..3f6e78c5a60 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
index a31e68636bd..8f35800e308 100644
--- a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
index b13e56552ea..d6ba3e02b2d 100644
--- a/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
+++ b/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var \Magento\Framework\Pricing\Render\Amount $this */ ?>
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
index 314e7f89b79..5f4256ad9ae 100644
--- a/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
+++ b/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
index 3fc03996788..9764d20c754 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_product = $this->getProduct() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
index fe40024dc8c..f76861cabc4 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
index af04e619c3e..6b9ebcde339 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */
?>
<?php $_product = $this->getProduct() ?>
@@ -17,4 +19,4 @@
</p>
<?php endif; ?>
<?php endif; ?>
-<?php echo $this->getChildHtml('bundle_prices') ?>
\ No newline at end of file
+<?php echo $this->getChildHtml('bundle_prices') ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
index bde619ee0bb..1c0aae577ce 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox */ ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
index 1038c70641a..04552c6ccbe 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi */ ?>
<?php $_option = $this->getOption() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
index 836287f629b..88b08b469da 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio */ ?>
<?php $_option = $this->getOption(); ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
index b549558dd5a..d7bcf671ad1 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select */ ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
index 36081fadf10..ed9dbc49d44 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */ ?>
<?php
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
index 6e876c6da53..a8347ee82dd 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
<?php $parentItem = $this->getItem() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
index 6389bf74e61..1ae97068724 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
index cc49ed9047d..275273b525c 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
index ec997a63f52..7e371c79912 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $parentItem = $this->getItem() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml b/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
index cb1d9bf17c6..9d21951fe9b 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
<?php $parentItem = $this->getItem() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
index 04de3e5afcb..e6c4c28e7e9 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
<?php $parentItem = $this->getItem() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
index e2f2383d9a4..737e8ecc84c 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Bundle\Block\Sales\Order\Items\Renderer */
?>
<?php $parentItem = $this->getItem() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
index d78f0ea882d..2f903f002a6 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $parentItem = $this->getItem() ?>
<?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
diff --git a/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php b/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
index 178349437c2..36ef651548f 100644
--- a/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
+++ b/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Data source to fill "Forms" field
*
diff --git a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
index 157363d6dfd..a9df7ca92e5 100644
--- a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $captcha \Magento\Captcha\Model\DefaultModel */ ?>
<?php /* @var $this \Magento\Captcha\Block\Captcha\DefaultCaptcha */ ?>
diff --git a/app/code/Magento/Captcha/view/frontend/templates/default.phtml b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
index 469409aca6c..6ad86a35ccc 100644
--- a/app/code/Magento/Captcha/view/frontend/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $captcha \Magento\Captcha\Model\DefaultModel */ ?>
<?php /* @var $this \Magento\Captcha\Block\Captcha\DefaultCaptcha */ ?>
diff --git a/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml b/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 9abf8ed3f23..a582b3c2f75 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Categories tree block
*/
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index a266bae27ad..4ab06353511 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Product attribute add/edit form main tab
*
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index 7dd12041a74..142ca258035 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Adminhtml catalog product edit action attributes update tab block
*
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index c3b53c1f3f4..27feb11a253 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Product alerts tab
*
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 5850fc36e56..8fd26c84e9f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Customers defined options
*/
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
index e0eec0d5ba6..21a606eabf2 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
use Magento\Catalog\Model\Resource\Category\Collection;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index c62ed8ef09f..5e67c7ca356 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Catalog product gallery attribute
diff --git a/app/code/Magento/Catalog/Block/Breadcrumbs.php b/app/code/Magento/Catalog/Block/Breadcrumbs.php
index 80087dcc281..93b564e7f6b 100644
--- a/app/code/Magento/Catalog/Block/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/Block/Breadcrumbs.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Catalog breadcrumbs
*/
diff --git a/app/code/Magento/Catalog/Block/Navigation.php b/app/code/Magento/Catalog/Block/Navigation.php
index 7ffe52b6eb4..85c13303864 100644
--- a/app/code/Magento/Catalog/Block/Navigation.php
+++ b/app/code/Magento/Catalog/Block/Navigation.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Block;
use Magento\Catalog\Model\Category;
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
index ac48c37b377..af53df1c0b6 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Block\Product\ProductList;
use Magento\Catalog\Model\Resource\Product\Collection;
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
index 249c016154e..06e9c320caf 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Block\Product\ProductList;
use Magento\Catalog\Model\Resource\Product\Collection;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
index b33bb614eb1..7a53121b985 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Controller\Adminhtml\Product\Action;
use Magento\Backend\App\Action;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index c9875cf4773..2f9ebd97dcc 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
use Magento\Catalog\Model\Product\AttributeSet\AlreadyExistsException;
diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
index 5f4f62e5590..03e835ea40c 100644
--- a/app/code/Magento/Catalog/Helper/Product/ProductList.php
+++ b/app/code/Magento/Catalog/Helper/Product/ProductList.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Helper\Product;
/**
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index cae94027454..ee41828aa41 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Helper\Product;
use Magento\Framework\View\Result\Page as ResultPage;
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index c952319dd55..9aa94feeab0 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model;
/**
diff --git a/app/code/Magento/Catalog/Model/Factory.php b/app/code/Magento/Catalog/Model/Factory.php
index 3927fba5c60..61c2cc9491e 100644
--- a/app/code/Magento/Catalog/Model/Factory.php
+++ b/app/code/Magento/Catalog/Model/Factory.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Model factory
*/
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index a3d2ef62ea8..8a0614e3d6b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Category\Flat;
class AbstractAction
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 9df68e4fc9a..eb2a59bebe1 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Category\Product;
abstract class AbstractAction
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/IndexerState.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/IndexerState.php
index e736c9f96bc..495b5e0b7a4 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/IndexerState.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/IndexerState.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
class IndexerState
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php
index 34c2d865fd4..a70c1d0a12c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
class MviewState
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
index a65361a3a7d..4110be1eb41 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Product\Flat\Plugin;
class Store
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
index 10e7533aa7c..d53ddfbbb09 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Product\Flat\Plugin;
class StoreGroup
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
index 3a6fb7f72a7..3df515c872b 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Layer\Filter\Dynamic;
use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Item.php b/app/code/Magento/Catalog/Model/Layer/Filter/Item.php
index 3e9985cbc88..d5646809665 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Item.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Item.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Filter item model
*
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index 30502703baa..6025d2020a7 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Layer\Filter;
/**
diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php
index f978227925c..e4c7a7882bb 100644
--- a/app/code/Magento/Catalog/Model/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/Product/Action.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product;
/**
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php
index 2f07f6ea542..e02c9c5b9f2 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Groupprice/AbstractGroupprice.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product\Attribute\Backend\Groupprice;
use Magento\Catalog\Model\Product\Attribute\Backend\Price;
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
index ed176345402..b52d4a19c20 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Catalog product SKU backend attribute model
*
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
index b47b04bbbba..da5d9604f8b 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Product attribute source input types
*/
diff --git a/app/code/Magento/Catalog/Model/Product/Media/Config.php b/app/code/Magento/Catalog/Model/Product/Media/Config.php
index b43d5ad77d5..a861e329155 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/Config.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/Config.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product\Media;
/**
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index cdc0c608ba6..5bef8a350a7 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product;
use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 76a465081d4..bea3ab26db0 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product\Option\Type;
use Magento\Framework\Model\Exception;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index c412c77f588..af2b8d26f0b 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product\Option;
use Magento\Framework\Model\AbstractExtensibleModel;
diff --git a/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php b/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php
index 621f518e169..45666da1e25 100644
--- a/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php
+++ b/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product;
use Magento\Catalog\Model\Product;
diff --git a/app/code/Magento/Catalog/Model/Product/Website.php b/app/code/Magento/Catalog/Model/Product/Website.php
index 74839de58ff..b4fb2e1934b 100644
--- a/app/code/Magento/Catalog/Model/Product/Website.php
+++ b/app/code/Magento/Catalog/Model/Product/Website.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Catalog Product Website Model
*
diff --git a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
index ecb67e61160..0cd1293c0b0 100644
--- a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Resource;
use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
diff --git a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
index da3f8ce04f1..ad80534edaa 100644
--- a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Resource\Eav;
use Magento\Catalog\Model\Attribute\LockValidatorInterface;
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
index 267a3afc26c..d9aeeb2f1ff 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend;
/**
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
index cc0bb42dd95..d2c0f43e208 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Resource\Product;
use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index 5ef2dab0e02..0571d9de7ab 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Catalog Template Filter Model
*
diff --git a/app/code/Magento/Catalog/Model/Template/Filter/Factory.php b/app/code/Magento/Catalog/Model/Template/Filter/Factory.php
index 0148b6d711c..669d4aa5df2 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter/Factory.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter/Factory.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Template filter factory
*/
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index 757eb4dd4f1..6d7cd1e6b81 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Pricing\Price;
use Magento\Catalog\Model\Product;
diff --git a/app/code/Magento/Catalog/data/catalog_setup/data-install-2.0.0.php b/app/code/Magento/Catalog/data/catalog_setup/data-install-2.0.0.php
index 07df76dfd8c..25875da59ea 100644
--- a/app/code/Magento/Catalog/data/catalog_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Catalog/data/catalog_setup/data-install-2.0.0.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $installer \Magento\Catalog\Model\Resource\Setup */
$installer = $this;
$installer->installEntities();
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
index 5fbb102415a..1bdf23fe3d5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_divId = 'tree-div_' . time() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
index d1d3ec2b114..a007d61db67 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
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 7e1c69ed49a..6e0c141cd02 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
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Catalog\Block\Adminhtml\Category\Edit\Form $this */
$parentId = $this->getParentCategoryId();
$categoryId = $this->getCategoryId();
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
index 456b61cbb17..bef46bb34f1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="categories-side-col">
<div class="sidebar-actions">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
index c66b2cf0b17..f05d74712e8 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_divId = 'tree' . $this->getId() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
index eb2a991cbbf..d977abdcaaf 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
index f3e140ef620..a2f06c803a3 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
index 3249103e9fa..e47439652c9 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
index ed16b596237..dc9f97436f8 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
require(["jquery", "js/theme", "prototype"], function(jQuery){
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
index 2f074979ba1..dc697e8074f 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels */
?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
index 2ed20b3a563..01965c083f4 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
?>
<fieldset class="fieldset">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
index ffd8c32625d..54a1ca3e820 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="attribute-set">
<div class="edit-attribute-set attribute-set-col">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
index d446e7eaee5..26850ee918e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index da52b2f3579..fce93c1ee4c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div id="product_composite_configure" class="product-configure-popup" style="display:none;">
<iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe" style="width:0; height:0; border:0px solid #fff; position:absolute; top:-1000px; left:-1000px" onload="window.productConfigure && productConfigure.onLoadIFrame()"></iframe>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
index 6ab4ee7c165..c6b6dc0bffc 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
index 4b84adec046..7444e1931a3 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
<?php $_option = $this->getOption(); ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
index b208c2b5a63..2b03d05a3cc 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_option = $this->getOption(); ?>
<?php $_fileInfo = $this->getFileInfo(); ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
index 68b668b44ec..83a9ec12657 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
<?php $_option = $this->getOption(); ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
index 0fc119948ce..4cd7063ece9 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
<?php $_option = $this->getOption(); ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
index 889740de6f8..ad72399f666 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty */ ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
index af9c18595b2..e1d846e01af 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
index cf9a8a37057..1b7f2d6d4f6 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form action="<?php echo $this->getSaveUrl() ?>" method="post" id="attributes-edit-form" class="attributes-edit-form" enctype="multipart/form-data">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
index 9480035933a..2328dd37211 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
require(['jquery'], function($){
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
index a02b8c7e7d6..4bbaa64001c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="fieldset-wrapper" id="add-products-to-website-wrapper">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
index 4507fa43ba0..73e1d702c27 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
?>
<script id="product-template-selector-template" type="text/x-jquery-tmpl">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
index a1b60b7b5c5..1da0c734b85 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options */ ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
index fe1ff5237a0..f252d700a83 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */ ?>
<?php echo $this->getTemplatesHtml() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
index 15705121dad..7946f0b44b7 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date */ ?>
<script id="custom-option-date-type-template" type="text/x-jquery-tmpl">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
index 1cf4ad82515..0d4026c0491 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File */ ?>
<script id="custom-option-file-type-template" type="text/x-jquery-tmpl">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
index 741c71d74ab..1bf1389819e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select */ ?>
<script id="custom-option-select-type-template" type="text/x-jquery-tmpl">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
index 1d9434de61f..02ba5bf1bc5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text */ ?>
<script id="custom-option-text-type-template" type="text/x-jquery-tmpl">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml
index 9d6f501719a..cbe8580f24e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group */
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
index e345090a9a9..42c0d7ec9ac 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier */
$element = $this->getElement();
?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
index 52771523afa..3468b76d56e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_id = 'id_' . md5(microtime()) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
index 736e32c1033..067914af181 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<fieldset id="grop_fields" class="fieldset">
<legend class="legend"><span><?php echo __('Product In Websites') ?></span></legend>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
index 7f8f17716dc..3c37d414813 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
$elementName = $this->getElement()->getName() . '[images]';
?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
index bedf2fe0214..4d0fa7c9030 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $this */
?>
<script type="text/javascript">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml
index 61a542dd5e0..a9fe6c4aef7 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
index 6f7f4a94f2d..9df7cd82110 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory */
?>
<?php if ($this->isReadonly()): ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
index 6bfb7af0965..ece0322a310 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
require([
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
index 8047a950b64..3b7bb0cbcef 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search */
?>
<div id="product-attribute-search-container" class="suggest-expandable attribute-selector">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
index 6a8eb1c0afd..351464c8c55 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs */
?>
<?php if (!empty($tabs)): ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
index 13a2e60bcc7..fe02f311816 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @deprecated support Magento 1.x grid massaction implementation (MAGETWO-11122)
*/
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
index cf96940fd96..45ba60e26cf 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Catalog\Block\Adminhtml\Rss\Grid\Link */
?>
<?php if ($this->isRssAllowed() && $this->getLink()): ?>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
index d28cbe9ddf3..bc854d00047 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var \Magento\Framework\Pricing\Render\Amount $this */ ?>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/amount/option.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/amount/option.phtml
index b764824a41a..f0d8221f2f4 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/amount/option.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/amount/option.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Framework\Pricing\Render\Amount $this */
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
index 5d4a9db17c2..06c0c98e84a 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
index 6bc29782f85..1443870da7a 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
index 82d3149d268..a7dd12fb2e8 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
index 8a47f406c2d..bb00ff2c77c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
index 57fe5194888..47c9960b434 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
index 42bb865ebcf..49fe477fe87 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
index 1f82ddb5298..daf00d660c7 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
index 1e9e4478322..4555ad21e6d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->isRssAllowed() && $this->getLink() && $this->isTopCategory()): ?>
<a href="<?php echo $this->getLink() ?>" class="action link rss"><span><?php echo $this->getLabel() ?></span></a>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/view.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/view.phtml
index 619b6814ad6..9f8dd8e6a57 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/view.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/view.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/js/components.phtml b/app/code/Magento/Catalog/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
index 0b4492e4f8d..730bc394a6f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Category left navigation
*
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
index 6a87380edfa..0561acac389 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Catalog\Block\Product\Compare\Sidebar */
?>
<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
index abaf0c4a29b..662fe7fb95a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Catalog\Block\Product\Compare\ListCompare */
?>
<?php $_total = $this->getItems()->getSize() ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
index e808ca97ecc..42e95d39dd1 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Catalog\Block\Product\Compare\Sidebar */
?>
<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
index 2e8ceebe178..7bf71c84f5b 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_width = $this->getImageWidth(); ?>
<div class="product-image-popup" style="width:<?php echo $_width; ?>px;">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index fd357f59d89..883733afa86 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
index 99b0a48846f..2cec2a9a7d1 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Catalog\Block\Product\AbstractProduct */
?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
index 7fa828ff6b5..4323e1af22f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
index f2cbd86b6b3..bda75f3544e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
index 07df6bdce7d..d9ed43e21ea 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
index f07151ced50..f891b1f8549 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
index 90e118bfc12..fea7eb31c09 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
index 6352a0a825c..180d1c0e2c9 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
index 31d07ae91ac..49cbdd1266a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php foreach ($this->getChildHtmlList() as $_html): ?>
<?php echo $_html ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
index 684fb0cbc3f..9edb3855782 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Catalog\Block\Product\View*/
?>
<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
index 3968a9a1bee..647322ac36a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Catalog\Block\Product\View */
?>
<?php $_product = $this->getProduct(); ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
index bb4f4797f3d..99898b9491f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Product view template
*
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
index b48e3b0f41e..a735867c0eb 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Product additional attributes template
*
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/base-image.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/base-image.phtml
index 36d3e310f72..a644e02201e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/base-image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/base-image.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Product media data template
*
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml
index 2d7896bf346..83b24ff62d0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Product description template
*
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
index 4cbea0ba4fa..9e0c2f29d20 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($detailedInfoGroup = $this->getGroupChildNames('detailed_info', 'getChildHtml')):?>
<div class="product info detailed">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index b2754ebd1d9..3a1505e640e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Product view template
*
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
index baf782bf963..405e46469ca 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_product = $this->getProduct() ?>
<?php if ($this->canEmailToFriend()): ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
index e83d3e88b8a..2aea7a7b544 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Catalog\Block\Product\View */
?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
index dca61d0bb5a..4c9ba208d01 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Catalog\Block\Product\View\Options */
?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
index 5ab93a09f9f..fcef64f933d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_option = $this->getOption() ?>
<?php $_optionId = $_option->getId() ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
index f5960788749..3a6ade2f7c5 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_option = $this->getOption() ?>
<div class="field">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
index 69ac13c41ff..5ab64bda0c3 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_option = $this->getOption(); ?>
<?php $_fileInfo = $this->getFileInfo(); ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
index 9174ad001fc..71362df40c9 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
index 41707933556..3f18c8b8c55 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
$_option = $this->getOption();
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
index 7fc39b05695..e0ce434e672 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var \Magento\Catalog\Block\Product\AbstractProduct $this */ ?>
<?php $_product = $this->getProduct() ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
index ce96fe87bd9..9b2212deaf6 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Catalog\Block\Product\AbstractProduct */ ?>
<?php echo $this->getReviewsSummaryHtml($this->getProduct(), false, true)?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
index 7b6fe8501b0..676593b9774 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Catalog\Block\Product\View\AbstractView */?>
<?php $_product = $this->getProduct() ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
index 5dda83c4eab..d7ba4083294 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
<?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
index 7056f08948a..85f30c240a7 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
<?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
index 381c873ed35..a8534dd21ac 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
<div class="block widget block-new-products-names">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
index 11fbb9a7863..6d61fc02e55 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
index 6f6a5f85504..12a7c06ac5f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 0164b490e1c..27e4398ca11 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogImportExport\Model\Import;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index bb1c2245c6b..f60474bd854 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogImportExport\Model\Import\Product;
/**
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php
index fb8f91a4efe..b5247dcd358 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogImportExport\Model\Indexer\Category\Product\Plugin;
class Import
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php
index 0f3ed1740f4..3213c142bc6 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogImportExport\Model\Indexer\Product\Category\Plugin;
class Import
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteria.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteria.php
index 4b5081f75bc..b9ba31f0ad0 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteria.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogInventory\Model\Resource\Stock\Item;
use Magento\Framework\Data\AbstractCriteria;
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status/StockStatusCriteria.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status/StockStatusCriteria.php
index 234e06f1fdf..f3296d0905a 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status/StockStatusCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status/StockStatusCriteria.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogInventory\Model\Resource\Stock\Status;
use Magento\Framework\Data\AbstractCriteria;
diff --git a/app/code/Magento/CatalogInventory/Model/StockIndex.php b/app/code/Magento/CatalogInventory/Model/StockIndex.php
index c7a1d895e09..21323b9aca2 100644
--- a/app/code/Magento/CatalogInventory/Model/StockIndex.php
+++ b/app/code/Magento/CatalogInventory/Model/StockIndex.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogInventory\Model;
use Magento\Catalog\Model\Product\Type as ProductType;
diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
index bb82b4c100f..3fdd864e82f 100644
--- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogInventory\Model;
use Magento\Catalog\Model\ProductFactory;
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
index 7409088b2bb..e2c061ce209 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\CatalogInventory\Block\Qtyincrements
*/
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
index ef447eddc5f..425ddbb1a21 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\CatalogInventory\Block\Stockqty\Composite
*/
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
index 062821a2898..c0a89544bf0 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\CatalogInventory\Block\Stockqty\DefaultStockqty
*/
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
index 8851a48afd7..aff2d8c2903 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Backend Catalog Price Rules controller
*
diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
index d71ef901ced..ec5aeb9569f 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_element = $this->getElement() ?>
<div class="rule-tree">
diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
index 7aef8857122..3716a316d20 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="entry-edit rule-tree">
<?php echo $this->getFormHtml() ?>
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
index 678ffa8339b..431d8ab3822 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogSearch\Model\Resource\Search;
/**
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
index eea1f416d64..83516b2e332 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
index ad6479f3e0c..8101d33fce5 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var \Magento\CatalogSearch\Helper\Data $helper */
$helper = $this->helper('Magento\CatalogSearch\Helper\Data');
?>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
index da9c8d96d66..7e28575267e 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
index fbe2888a5ad..f15e1730f76 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getResultCount()): ?>
<?php echo $this->getChildHtml('tagged_product_list_rss_link'); ?>
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index c20e511bf7e..2cb2dcc7fef 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogWidget\Block\Product;
/**
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 5b368274432..f4d960c5954 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
$element = $this->getElement();
diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 833bc4e70b6..6d2cb0a7f4e 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Centinel/Model/Config.php b/app/code/Magento/Centinel/Model/Config.php
index 89cc104a3c5..6fbb3448561 100644
--- a/app/code/Magento/Centinel/Model/Config.php
+++ b/app/code/Magento/Centinel/Model/Config.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Config centinel model
*/
diff --git a/app/code/Magento/Centinel/view/adminhtml/templates/authentication/complete.phtml b/app/code/Magento/Centinel/view/adminhtml/templates/authentication/complete.phtml
index 43160f4f02b..28dbf71cc19 100644
--- a/app/code/Magento/Centinel/view/adminhtml/templates/authentication/complete.phtml
+++ b/app/code/Magento/Centinel/view/adminhtml/templates/authentication/complete.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getIsProcessed()):?>
<?php if ($this->getIsSuccess()):?>
diff --git a/app/code/Magento/Centinel/view/adminhtml/templates/validation/form.phtml b/app/code/Magento/Centinel/view/adminhtml/templates/validation/form.phtml
index 49669db1688..01a1cf3048d 100644
--- a/app/code/Magento/Centinel/view/adminhtml/templates/validation/form.phtml
+++ b/app/code/Magento/Centinel/view/adminhtml/templates/validation/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="centinel">
diff --git a/app/code/Magento/Centinel/view/frontend/templates/authentication.phtml b/app/code/Magento/Centinel/view/frontend/templates/authentication.phtml
index 17c213b1ae6..c5b9e07b338 100644
--- a/app/code/Magento/Centinel/view/frontend/templates/authentication.phtml
+++ b/app/code/Magento/Centinel/view/frontend/templates/authentication.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getAuthenticationStart()):?>
<div class="centinel" id="centinel-authenticate-block" data-mage-init='{"centinelAuthenticate": {"frameUrl": "<?php echo $this->getFrameUrl() ?>"}}'>
diff --git a/app/code/Magento/Centinel/view/frontend/templates/authentication/complete.phtml b/app/code/Magento/Centinel/view/frontend/templates/authentication/complete.phtml
index 7f5f86bcac4..4bd06d4f022 100644
--- a/app/code/Magento/Centinel/view/frontend/templates/authentication/complete.phtml
+++ b/app/code/Magento/Centinel/view/frontend/templates/authentication/complete.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getIsProcessed()):?>
<?php if ($this->getIsSuccess()):?>
diff --git a/app/code/Magento/Centinel/view/frontend/templates/logo.phtml b/app/code/Magento/Centinel/view/frontend/templates/logo.phtml
index 879143eefbf..37e3b437c2f 100644
--- a/app/code/Magento/Centinel/view/frontend/templates/logo.phtml
+++ b/app/code/Magento/Centinel/view/frontend/templates/logo.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="field note <?php echo $this->getCode() ?> logos" id="<?php echo $this->getCode() ?>_centinel_logo">
<label class="label"><span><?php echo __('To ensure the security of your transactions') ?></span></label>
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index 77aa7bb122d..3ea6b78b24f 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Block\Cart\Item;
use Magento\Framework\Pricing\PriceCurrencyInterface;
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 6e08aebd3d7..e0cd7845470 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Block\Cart;
use Magento\Framework\View\Block\IdentityInterface;
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar/Totals.php b/app/code/Magento/Checkout/Block/Cart/Sidebar/Totals.php
index 4fb64b5e0c8..58347d21e22 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar/Totals.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar/Totals.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Block\Cart\Sidebar;
use Magento\Checkout\Block\Cart\AbstractCart;
diff --git a/app/code/Magento/Checkout/Block/Onepage/Failure.php b/app/code/Magento/Checkout/Block/Onepage/Failure.php
index 860faeec8f1..ae0219acdc7 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Failure.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Failure.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Block\Onepage;
class Failure extends \Magento\Framework\View\Element\Template
diff --git a/app/code/Magento/Checkout/Block/Onepage/Progress.php b/app/code/Magento/Checkout/Block/Onepage/Progress.php
index f500c66bcef..49450355472 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Progress.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Progress.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Block\Onepage;
use Magento\Sales\Model\Quote\Address;
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index 805d58e89c5..1e5fbd4275b 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Controller\Cart;
use Magento\Catalog\Api\ProductRepositoryInterface;
diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 32d273a31fa..8c9805ee555 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Controller\Cart;
class Index extends \Magento\Checkout\Controller\Cart
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
index 36d2d63ffad..757d23c111f 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Controller\Cart;
class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index 314755827a7..9366b674a32 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Controller\Cart;
class UpdatePost extends \Magento\Checkout\Controller\Cart
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index 215468d34b6..15d27b62272 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Helper;
/**
diff --git a/app/code/Magento/Checkout/Service/V1/Cart/WriteService.php b/app/code/Magento/Checkout/Service/V1/Cart/WriteService.php
index 9fbaebf61f2..34d6f24fdf7 100644
--- a/app/code/Magento/Checkout/Service/V1/Cart/WriteService.php
+++ b/app/code/Magento/Checkout/Service/V1/Cart/WriteService.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Cart;
use Magento\Authorization\Model\UserContextInterface;
diff --git a/app/code/Magento/Checkout/Service/V1/Data/Cart.php b/app/code/Magento/Checkout/Service/V1/Data/Cart.php
index 5e5903b6063..9cc064cafbc 100644
--- a/app/code/Magento/Checkout/Service/V1/Data/Cart.php
+++ b/app/code/Magento/Checkout/Service/V1/Data/Cart.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Data;
/**
diff --git a/app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteService.php b/app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteService.php
index c9b05597bc1..05af45dbde3 100644
--- a/app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteService.php
+++ b/app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteService.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\PaymentMethod;
use Magento\Checkout\Service\V1\Data\Cart\PaymentMethod\Builder;
diff --git a/app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceInterface.php b/app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceInterface.php
index 4b4bca3c9fd..955486054ae 100644
--- a/app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceInterface.php
+++ b/app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\PaymentMethod;
/**
diff --git a/app/code/Magento/Checkout/Service/V1/ShippingMethod/ReadService.php b/app/code/Magento/Checkout/Service/V1/ShippingMethod/ReadService.php
index 0be80cdfd2e..06d04be8581 100644
--- a/app/code/Magento/Checkout/Service/V1/ShippingMethod/ReadService.php
+++ b/app/code/Magento/Checkout/Service/V1/ShippingMethod/ReadService.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\ShippingMethod;
use Magento\Checkout\Service\V1\Data\Cart\ShippingMethod;
diff --git a/app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteService.php b/app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteService.php
index 02c1ec0c48b..e435a5a9e93 100644
--- a/app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteService.php
+++ b/app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteService.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\ShippingMethod;
use Magento\Framework\Exception\CouldNotSaveException;
diff --git a/app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteServiceInterface.php b/app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteServiceInterface.php
index fa77d39e24c..b3fe0664977 100644
--- a/app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteServiceInterface.php
+++ b/app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteServiceInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\ShippingMethod;
/**
diff --git a/app/code/Magento/Checkout/view/frontend/templates/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
index edd17cd6029..7ae40579920 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/button.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Checkout\Block\Onepage\Success */ ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml
index e2e6512057a..3e477bc47ff 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
index 569010cbbe3..da50fe7b163 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="block discount" id="block-discount" data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'>
<div class="title" data-role="title">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index 73eb202b6a8..9ffbd839a8d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Cart */
?>
<?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
index 0d5682e37e5..447c6635900 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Catalog\Block\Product\View */
?>
<?php $_product = $this->getProduct(); ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
index 405c4e466df..5de80c8982c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Cart\Item\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
index 9547e113c94..772f3f2e6c3 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Item\Price\Renderer */
?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
index ef22ef332b8..5c85077606f 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var $this \Magento\Checkout\Block\Cart */
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index 374146939ab..ded2c034cba 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Cart\Sidebar */
?>
<?php if ($this->getInList()): ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index aa931e8c923..bcef6cdebe8 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Checkout\Block\Cart\Shipping */ ?>
<div class="block shipping" id="block-shipping" data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/sidebar/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/sidebar/default.phtml
index 216039991e1..0b59abc1840 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/sidebar/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/sidebar/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var $this \Magento\Checkout\Block\Cart\Item\Renderer */
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
index e8c4c8ec48f..422ce854d3c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
index a31091f4830..54c41431d37 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml b/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index 884047490b1..58d1d163bf3 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Checkout\Block\Onepage\Payment $_paymentBlock */
$_paymentBlock = $this->getLayout()->getBlock('checkout.onepage.payment');
?>
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 e3ba09c0a7c..2b975d9d611 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Checkout\Block\Onepage\Billing $this */
?>
<form class="form billing" id="co-billing-form" data-hasrequired="<?php echo __('* Required Fields') ?>">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
index e3c993483b0..74ed53707c5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getRealOrderId()) : ?><p><?php echo __('Order #') . $this->getRealOrderId() ?></p><?php endif ?>
<?php if ($error = $this->getErrorMessage()) : ?><p><?php echo $error ?></p><?php endif ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
index 43379c6513e..b9a69e47d40 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->isPossibleOnepageCheckout()):?>
<button type="button"
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/login.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/login.phtml
index d331ea8a907..4ca3d22364d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/login.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/login.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml
index 6ee944452d7..dd4352f9f44 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form id="co-payment-form" class="form payments">
<?php echo $this->getBlockHtml('formkey') ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml
index 04aaf741f01..f463ab36c79 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/progress.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/progress.phtml
index c0478e9a6d9..25e8651fd6a 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/progress.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/progress.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Checkout\Block\Onepage\Progress */
?>
<div class="opc-block-progress<?php if ($this->isStepComplete('billing')): ?> active<?php endif; ?><?php if ($this->isStepComplete('payment')): ?> order-review-step<?php endif; ?>">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml
index 00068e1f772..0ea79906d06 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Onepage\Review\Info */
?>
<?php echo $this->getChildHtml('items_before'); ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
index 39e387775c5..a288c9198af 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this Magento\Checkout\Block\Cart\Item\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
index 2e63be53734..ce835ae7df4 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
index 7dd4f879ae3..812ce6c3afe 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
index f81da666b80..9450a550ede 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
index 42682923008..655e9e9ed17 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/totals.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/totals.phtml
index 8a74155302e..b66f06d8bcc 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/totals.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/totals.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @see \Magento\Checkout\Block\Cart\Totals
*/
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 59c0c325c73..bd06a70a72b 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form class="form shipping address" id="co-shipping-form" data-hasrequired="<?php echo __('* Required Fields') ?>">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml
index f453b269577..86fb17c6cd7 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form class="form methods-shipping" id="co-shipping-method-form">
<div id="checkout-shipping-method-load"></div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/additional.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/additional.phtml
index aa3470fc76d..073ed920f8c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/additional.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/additional.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (!$this->getQuote()->isVirtual()): ?>
<?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getInline('onepage_checkout', $this->getQuote(), $this->getDontDisplayContainer()) ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml
index 005f29bee5e..344999996d1 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Checkout\Block\Onepage\Shipping\Method\Available */ ?>
<?php $_shippingRateGroups = $this->getShippingRates(); ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
index ad4d53fe050..7948c4d0322 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Checkout\Block\Shipping\Price */ ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
index d3343a283af..e82375bbb3f 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Checkout\Block\Onepage\Success */ ?>
<div class="checkout-success">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
index 58dfaa9d881..bf4d35ac51d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<tr class="totals">
<th colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>" class="mark" scope="row">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/nominal.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/nominal.phtml
index cf2381900e9..c1ea4a7873e 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/total/nominal.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/total/nominal.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Checkout\Block\Total\Nominal */
?>
<tr class="totals nominal">
diff --git a/app/code/Magento/CheckoutAgreements/Block/Agreements.php b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
index a9ebd6d2284..0fe31a67925 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Agreements.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CheckoutAgreements\Block;
class Agreements extends \Magento\Framework\View\Element\Template
diff --git a/app/code/Magento/CheckoutAgreements/Model/Resource/Agreement.php b/app/code/Magento/CheckoutAgreements/Model/Resource/Agreement.php
index b01a7ad2ac5..866ec3f1398 100644
--- a/app/code/Magento/CheckoutAgreements/Model/Resource/Agreement.php
+++ b/app/code/Magento/CheckoutAgreements/Model/Resource/Agreement.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CheckoutAgreements\Model\Resource;
/**
diff --git a/app/code/Magento/CheckoutAgreements/Model/Resource/Agreement/Collection.php b/app/code/Magento/CheckoutAgreements/Model/Resource/Agreement/Collection.php
index 3ed8a7fe901..80e4ab8c9a7 100644
--- a/app/code/Magento/CheckoutAgreements/Model/Resource/Agreement/Collection.php
+++ b/app/code/Magento/CheckoutAgreements/Model/Resource/Agreement/Collection.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CheckoutAgreements\Model\Resource\Agreement;
/**
diff --git a/app/code/Magento/CheckoutAgreements/Service/V1/Agreement/ReadService.php b/app/code/Magento/CheckoutAgreements/Service/V1/Agreement/ReadService.php
index dd14b0ea705..8e4f24f43cc 100644
--- a/app/code/Magento/CheckoutAgreements/Service/V1/Agreement/ReadService.php
+++ b/app/code/Magento/CheckoutAgreements/Service/V1/Agreement/ReadService.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CheckoutAgreements\Service\V1\Agreement;
use \Magento\CheckoutAgreements\Model\Resource\Agreement\CollectionFactory as AgreementCollectionFactory;
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
index a1227bf951b..a0e86109c92 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
index e901e40f403..23b5271e7e6 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
index d45bf1a9aa6..ba27904ea54 100644
--- a/app/code/Magento/Cms/Block/Block.php
+++ b/app/code/Magento/Cms/Block/Block.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Cms\Block;
/**
diff --git a/app/code/Magento/Cms/Model/Resource/Page.php b/app/code/Magento/Cms/Model/Resource/Page.php
index f0af2d9ca05..1597d315059 100644
--- a/app/code/Magento/Cms/Model/Resource/Page.php
+++ b/app/code/Magento/Cms/Model/Resource/Page.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Cms\Model\Resource;
/**
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
index 8c59d142024..48d0f2d75ad 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Cms\Model\Wysiwyg\Images\Storage;
use Magento\Framework\App\Filesystem\DirectoryList;
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 f396184b430..fa6e663f4a0 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
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Cms\Model\Resource\Setup */
$cmsPages = [
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
index da746ded436..d1318d07c2b 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content */
?>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
index f779ba75e03..dc11c68432c 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Files */
$_width = $this->getImagesWidth();
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index 0be818bcc60..b3ee32e14a2 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader */
?>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
index 74748232596..0a6fff4a82f 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree $this */
?>
<div class="tree-panel" >
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml b/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml
index 3cafa1bf967..ad41e6bed92 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_element = $this->getElement() ?>
diff --git a/app/code/Magento/Cms/view/frontend/templates/content.phtml b/app/code/Magento/Cms/view/frontend/templates/content.phtml
index 7f241022a4a..f416bf9ca60 100644
--- a/app/code/Magento/Cms/view/frontend/templates/content.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/content.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $pageData->getPageContent(); ?>
diff --git a/app/code/Magento/Cms/view/frontend/templates/meta.phtml b/app/code/Magento/Cms/view/frontend/templates/meta.phtml
index f74344da0a3..8adf0a935f7 100644
--- a/app/code/Magento/Cms/view/frontend/templates/meta.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/meta.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($pageData->getPageMetaKeywords()): ?>
<meta name="keywords" content="<?php echo $pageData->getPageMetaKeywords() ?>"/>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
index c169df06e58..7344eab6908 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
require(['jquery'], function(){
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
index 3ddc6d13b00..4ed5f8ed10b 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset\Configurable */ ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-js-template.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-js-template.phtml
index c7206853b19..17ad9b344f2 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-js-template.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-js-template.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Framework\View\Element\Template */
?>
<script data-template-for="configurable-attribute" type="text/x-jquery-tmpl">
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml
index 1e10e7be638..4c91bc84a12 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Framework\View\Element\Template */
$havePriceVariation = array_reduce(
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
index 4adacf909f3..e6fafada2cd 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super\Config */
use \Magento\ConfigurableProduct\Model\Product\Type\Configurable;
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
index 6a17b3c1b40..f60f2ab9cbb 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super\Config\Matrix */
?>
<?php
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
index 68f71e49ef5..1affca7b85a 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Framework\View\Element\Template */
?>
<div id="<?php echo $this->getNameInLayout() ?>" style="display:none" data-role="dialog" data-id="affected-attribute-set-selector">
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
index b4ac2d48cec..d92b6c463d4 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
?>
<script type="text/javascript">
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
index e90ba87bc3b..dff8b181cb0 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
index 74406921c5f..57df477a6a8 100644
--- a/app/code/Magento/Contact/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Contact/view/frontend/templates/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form class="form contact"
action="<?php echo $this->getFormAction(); ?>"
diff --git a/app/code/Magento/Core/Model/Asset/Config.php b/app/code/Magento/Core/Model/Asset/Config.php
index 2cc432a6558..6d295d8389c 100644
--- a/app/code/Magento/Core/Model/Asset/Config.php
+++ b/app/code/Magento/Core/Model/Asset/Config.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Asset;
/**
diff --git a/app/code/Magento/Core/Model/File/Storage.php b/app/code/Magento/Core/Model/File/Storage.php
index b610a3c3cd4..5bdbf7f7450 100644
--- a/app/code/Magento/Core/Model/File/Storage.php
+++ b/app/code/Magento/Core/Model/File/Storage.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\File;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/app/code/Magento/Core/Model/File/Storage/Directory/Database.php b/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
index 34d7fd72e34..7298984ae67 100644
--- a/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
+++ b/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\File\Storage\Directory;
/**
diff --git a/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php b/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
index 9254b1fc3b0..453904a2e50 100644
--- a/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
+++ b/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\File\Validator;
/**
diff --git a/app/code/Magento/Core/Model/Resource/Config.php b/app/code/Magento/Core/Model/Resource/Config.php
index 7db3fd5b112..6c18d8200b3 100644
--- a/app/code/Magento/Core/Model/Resource/Config.php
+++ b/app/code/Magento/Core/Model/Resource/Config.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Resource;
/**
diff --git a/app/code/Magento/Core/Model/Resource/Design.php b/app/code/Magento/Core/Model/Resource/Design.php
index 0e7d6525dbc..54fb9492c99 100644
--- a/app/code/Magento/Core/Model/Resource/Design.php
+++ b/app/code/Magento/Core/Model/Resource/Design.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Resource;
use Magento\Framework\Stdlib\DateTime;
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Update.php b/app/code/Magento/Core/Model/Resource/Layout/Update.php
index cc9aea582bf..35cd626fbd7 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Update.php
+++ b/app/code/Magento/Core/Model/Resource/Layout/Update.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Resource\Layout;
/**
diff --git a/app/code/Magento/Core/Model/Resource/Variable.php b/app/code/Magento/Core/Model/Resource/Variable.php
index 28fcaff741e..be932a88743 100644
--- a/app/code/Magento/Core/Model/Resource/Variable.php
+++ b/app/code/Magento/Core/Model/Resource/Variable.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Resource;
/**
diff --git a/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php b/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php
index f2245e8eacd..6d43acfa6ec 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php
+++ b/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\TemplateEngine\Decorator;
class DebugHints implements \Magento\Framework\View\TemplateEngineInterface
diff --git a/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php b/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php
index 8e801710074..f6e2743d510 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php
+++ b/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\TemplateEngine\Plugin;
class DebugHints
diff --git a/app/code/Magento/Core/Model/Url/RouteParamsResolver.php b/app/code/Magento/Core/Model/Url/RouteParamsResolver.php
index 5ea49391c63..612f592d79a 100644
--- a/app/code/Magento/Core/Model/Url/RouteParamsResolver.php
+++ b/app/code/Magento/Core/Model/Url/RouteParamsResolver.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Url;
class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\Framework\Url\RouteParamsResolverInterface
diff --git a/app/code/Magento/Core/Model/Validator/Factory.php b/app/code/Magento/Core/Model/Validator/Factory.php
index 3986ec0b775..b5c4fb12004 100644
--- a/app/code/Magento/Core/Model/Validator/Factory.php
+++ b/app/code/Magento/Core/Model/Validator/Factory.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Validator;
class Factory
diff --git a/app/code/Magento/Core/Model/Variable/Config.php b/app/code/Magento/Core/Model/Variable/Config.php
index a9bddcc0c06..e4f21ae73cb 100644
--- a/app/code/Magento/Core/Model/Variable/Config.php
+++ b/app/code/Magento/Core/Model/Variable/Config.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Variable Wysiwyg Plugin Config
*
diff --git a/app/code/Magento/Core/view/frontend/templates/messages.phtml b/app/code/Magento/Core/view/frontend/templates/messages.phtml
index 8f7fc147465..eca088f952b 100644
--- a/app/code/Magento/Core/view/frontend/templates/messages.phtml
+++ b/app/code/Magento/Core/view/frontend/templates/messages.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php foreach ($types as $type) {
if ($messages = $this->getMessages($type)) {
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
index 3820ae88a33..e32c6d6fb43 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
index d0e5720b9e0..896af4be3c2 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
index 782729d99fa..9b0a235a3fd 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
index d370cfcf72d..bc6de335351 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
index fd7d842d4f5..54ac616dd2f 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Customer/Model/Metadata/ElementFactory.php b/app/code/Magento/Customer/Model/Metadata/ElementFactory.php
index c40429cb314..6a8a1fd6e60 100644
--- a/app/code/Magento/Customer/Model/Metadata/ElementFactory.php
+++ b/app/code/Magento/Customer/Model/Metadata/ElementFactory.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model\Metadata;
class ElementFactory
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
index 78461578f47..4bbb589c25b 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model\Metadata\Form;
use Magento\Framework\Api\ArrayObjectSearch;
diff --git a/app/code/Magento/Customer/Model/Observer.php b/app/code/Magento/Customer/Model/Observer.php
index 692055fddcb..513e0041d7d 100644
--- a/app/code/Magento/Customer/Model/Observer.php
+++ b/app/code/Magento/Customer/Model/Observer.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model;
/**
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml b/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
index 4cb74e9c17c..3872f0cc0a4 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
@@ -2,4 +2,7 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/edit/tab/account/form/renderer/group.phtml b/app/code/Magento/Customer/view/adminhtml/templates/edit/tab/account/form/renderer/group.phtml
index 6ef6a1b2f53..277fc22f0e1 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/edit/tab/account/form/renderer/group.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/edit/tab/account/form/renderer/group.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Customer\Block\Adminhtml\Edit\Renderer\Attribute\Group $this */
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/edit/tab/account/form/renderer/sendemail.phtml b/app/code/Magento/Customer/view/adminhtml/templates/edit/tab/account/form/renderer/sendemail.phtml
index 428bba3cd9b..215edd599f4 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/edit/tab/account/form/renderer/sendemail.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/edit/tab/account/form/renderer/sendemail.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Customer\Block\Adminhtml\Edit\Renderer\Attribute\Sendemail $this */
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
index 76c7a19bfcb..81441737c06 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
$_element = $this->getElement();
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
index deb8c19c908..ce995f421c4 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/addresses.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/addresses.phtml
index 2b7c7ce9967..3fdac219205 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/addresses.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/addresses.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Customer\Block\Adminhtml\Edit\Tab\Addresses */ ?>
<script data-template="tab-address-content" type="text/x-jquery-tmpl">
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
index 54114a4f227..720a9550b46 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Customer\Block\Adminhtml\Edit\Tab\Cart */ ?>
<?php if ($this->getCartHeader()): ?>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
index e799291b210..07661535074 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="entry-edit">
<?php echo $this->getForm()->getHtml() ?>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
index 80029014aa0..c6fc50c537b 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Template for block \Magento\Customer\Block\Adminhtml\Edit\Tab\View\Status\PersonalInfo
*/
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml
index 273d4a1edf0..1fc93e9df8c 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Customer\Block\Adminhtml\Edit\Tab\View\Sales */ ?>
<?php $singleStoreMode = $this->isSingleStoreMode(); ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
index 477dc7d40ab..f5a820d5aad 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if($this->customerLoggedIn()): ?>
<li class="customer-welcome">
@@ -15,4 +18,4 @@
</div>
<?php endif; ?>
</li>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
index 354c0429be6..3cda4a333d4 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Customer\Block\Account\Dashboard\Address $this */
?>
<div class="block block-dashboard-addresses">
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
index e9b3b049ba4..6eb4a4ff8fe 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Customer\Block\Account\Dashboard\Info $this */
?>
<div class="block block-dashboard-info">
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
index ddd54b0f1df..45d756c0d6e 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="actions-toolbar">
<div class="secondary"><a class="action back" href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><span><?php echo __('Back') ?></span></a></div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/additionalinfocustomer.phtml b/app/code/Magento/Customer/view/frontend/templates/additionalinfocustomer.phtml
index 11e79521443..c531dab269b 100644
--- a/app/code/Magento/Customer/view/frontend/templates/additionalinfocustomer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/additionalinfocustomer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index bbab39ccd7f..0f1b7aceabd 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index f70e56a2e88..b15874282b4 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
index 9f04f3fe4d6..83361224280 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form action="" method="post" id="form-validate" class="form send confirmation" data-mage-init='{"validation":{}}'>
<fieldset class="fieldset" data-hasrequired="<?php echo __('* Required Fields') ?>">
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
index babbdaf77b9..1fa862e0043 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Customer\Block\Form\Edit $this */
?>
<form class="form form-edit-account" action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?php echo __('* Required Fields') ?>" autocomplete="off">
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
index 8e1fa8860d9..28cc7814248 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
@@ -4,6 +4,9 @@
*
* @var $this \Magento\Customer\Block\Account\Forgotpassword
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form class="form password forget"
action="<?php echo $this->getUrl('*/*/forgotpasswordpost') ?>"
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
index 030d3f3c872..c927be6e5f6 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Customer\Block\Form\Login $this */
?>
<?php
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml b/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
index c89cb88cebb..16fa9d1ccf9 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml('form_before')?>
<form class="form form-newsletter-manage" action="<?php echo $this->getAction() ?>" method="post" id="form-validate">
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 6d51ea5df88..b7e1e02273e 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
index c5517a8abd0..a8910d54c5b 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Customer\Block\Account\Resetpassword $this */
?>
<form action="<?php echo $this->getUrl('*/*/resetpasswordpost', ['_query' => ['id' => $this->getCustomerId(), 'token' => $this->getResetPasswordLinkToken()]]); ?>"
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/components.phtml b/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml b/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
index f6cd50d708b..f49e12df3c0 100644
--- a/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
index d5ec17c6afa..d1bf89af0c7 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
USAGE:
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
index 48fb76fc769..76c6508d5aa 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="field gender<?php if ($this->isRequired()) echo ' required' ?>">
<label class="label" for="<?php echo $this->getFieldId('gender')?>"><span><?php echo __('Gender') ?></span></label>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
index 26920c9db5d..0f7c9f22c67 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
USAGE:
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
index 1c229b058db..30347f82c89 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="field taxvat<?php if ($this->isRequired()) echo ' required'; ?>">
<label class="label" for="<?php echo $this->getFieldId('taxvat')?>"><span><?php echo __('Tax/VAT number') ?></span></label>
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
index 2575c905f07..53edea241e4 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\DesignEditor\Block\Adminhtml\Editor;
/**
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer.php
index 610e3665cbb..c2695d5c595 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Color-picker form element renderer
*/
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
index fc85a193f80..7f7268a6f1a 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\DesignEditor\Block\Adminhtml\Editor\Form\Renderer;
/**
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/JsList.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/JsList.php
index b260d9e175d..bc49781f0b4 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/JsList.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools/JsList.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\DesignEditor\Controller\Adminhtml\System\Design\Editor\Tools;
class JsList extends \Magento\DesignEditor\Controller\Adminhtml\System\Design\Editor\Tools
diff --git a/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/Form/Renderer/Factory.php b/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/Form/Renderer/Factory.php
index 3d60fd98ba0..2fa624d4dd1 100644
--- a/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/Form/Renderer/Factory.php
+++ b/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/Form/Renderer/Factory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\DesignEditor\Model\Editor\Tools\QuickStyles\Form\Renderer;
use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
diff --git a/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/Renderer/Factory.php b/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/Renderer/Factory.php
index f7dc0322137..d56ad3726a9 100644
--- a/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/Renderer/Factory.php
+++ b/app/code/Magento/DesignEditor/Model/Editor/Tools/QuickStyles/Renderer/Factory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\DesignEditor\Model\Editor\Tools\QuickStyles\Renderer;
/**
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/container.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/container.phtml
index 9f03bae070d..f81d99d5de6 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/container.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/container.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Container */ ?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/color-picker.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/color-picker.phtml
index a987a55fc89..67fb49b96ce 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/color-picker.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/color-picker.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Form\Renderer\ColorPicker */ ?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite.phtml
index e24d3441c81..d100ff99107 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Form\Renderer\Composite */ ?>
<?php
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite/children.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite/children.phtml
index f00a7c3adac..240d4f209dd 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite/children.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite/children.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Form\Renderer\Composite */ ?>
<?php
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite/wrapper.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite/wrapper.phtml
index 1abc9f75d70..20edfe1140c 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite/wrapper.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/composite/wrapper.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Form\Renderer\Composite */ ?>
<?php
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/element/wrapper.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/element/wrapper.phtml
index a9cd7406452..46007d42574 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/element/wrapper.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/element/wrapper.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* former part of \Magento\Framework\Data\Form\Element\AbstractElement::getElementHtml() */ ?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/logo-uploader.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/logo-uploader.phtml
index d2cb10c8a7c..fa1dcddddb2 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/logo-uploader.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/logo-uploader.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Form\Renderer\LogoUploader */ ?>
<?php /** @var $element \Magento\DesignEditor\Block\Adminhtml\Editor\Form\Element\LogoUploader */?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/simple.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/simple.phtml
index 05c3b442342..c9f5d71fe08 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/simple.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/simple.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Form\Renderer\ColorPicker */ ?>
<?php
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/template.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/template.phtml
index 608ba8b7ef4..376fa3b89f6 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/template.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/template.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Form\Renderer\Checkbox */ ?>
<?php
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/toolbar/buttons.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/toolbar/buttons.phtml
index ad4e76c0af8..7ce1d90b958 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/toolbar/buttons.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/toolbar/buttons.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Toolbar\Buttons */ ?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/toolbar/buttons/edit.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/toolbar/buttons/edit.phtml
index 799a4fa8d28..9260d4dd7fa 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/toolbar/buttons/edit.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/toolbar/buttons/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Toolbar\Buttons\Edit */
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools.phtml
index f2e1c0d4b8f..77b08a026c4 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Tools */ ?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/block.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/block.phtml
index 54206f70ce4..c1a2e35d7b1 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/block.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/block.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Block */ ?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/custom.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/custom.phtml
index d96df2ce229..671ed6c08c0 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/custom.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/custom.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Custom */ ?>
<div id="vde-tab-custom-messages-placeholder"></div>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/js.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/js.phtml
index b5f2404ab9f..8fc622b1fd2 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/js.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/js.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Code\Js */ ?>
<div id="vde-tab-js-messages-placeholder"></div>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/content/files.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/content/files.phtml
index f32451c1488..1fa31c3cba7 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/content/files.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/content/files.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/settings.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/settings.phtml
index e19b2371010..ff1e0cde803 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/settings.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/settings.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Settings */ ?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/tabs.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/tabs.phtml
index 3b4aac6ef80..0f66a5a2c59 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/tabs.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/tabs.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Editor\Tools\Tabs\AbstractTabs */ ?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/tabs/super-handle.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/tabs/super-handle.phtml
index a66ad51cc73..2ba74bfe8aa 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/tabs/super-handle.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/tabs/super-handle.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Backend\Block\Template */ ?>
<li class="item<?php echo ' ',$this->getClass(); ?><?php echo $this->getIsHidden() ? ' hidden' : '' ?><?php echo $this->getIsDisabled() ? ' disabled' : '' ?>">
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/available.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/available.phtml
index c409e5b8e0a..0f601bd92d7 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/available.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/available.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Theme */?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/button.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/button.phtml
index 1016b7c4657..e1b66fafccb 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/button.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/button.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/customized.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/customized.phtml
index 7e9108809d2..a3b75377af0 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/customized.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/customized.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Theme */?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/list/available.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/list/available.phtml
index ad5cf2f73bd..f232e349b01 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/list/available.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/list/available.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\SelectorList\Available */?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/list/customized.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/list/customized.phtml
index ffb28a1b2d7..1621d068167 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/list/customized.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/list/customized.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\SelectorList\AbstractSelectorList */?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/first_entrance.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/first_entrance.phtml
index cc3df5c3ea0..46335bf5799 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/first_entrance.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/first_entrance.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Backend\Block\Template */?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/storeview.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/storeview.phtml
index 9462d3553da..e8b06a7d9de 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/storeview.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/storeview.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\StoreView */?>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/theme_edit.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/theme_edit.phtml
index bb995d2097d..516c3e4af73 100644
--- a/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/theme_edit.phtml
+++ b/app/code/Magento/DesignEditor/view/adminhtml/templates/theme/selector/theme_edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
diff --git a/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml b/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml
index e5c989dd441..ffaaf0abf34 100644
--- a/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml
+++ b/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Framework\View\Element\Template */ ?>
diff --git a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
index 168d07c7ed2..032040d5520 100644
--- a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
+++ b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Dhl\Block\Adminhtml;
/**
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 77d2105726f..aaf416d8e92 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Dhl\Model;
use Magento\Catalog\Model\Product\Type;
diff --git a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
index bafe51f5197..b9b17c3c1b6 100644
--- a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Dhl\Model\Plugin\Checkout\Block\Cart;
/**
diff --git a/app/code/Magento/Directory/Model/Country.php b/app/code/Magento/Directory/Model/Country.php
index 6088a6c6cc2..59780d30f34 100644
--- a/app/code/Magento/Directory/Model/Country.php
+++ b/app/code/Magento/Directory/Model/Country.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Country model
*
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Factory.php b/app/code/Magento/Directory/Model/Currency/Import/Factory.php
index d9fb7f9d7dd..80f3cc1b538 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Factory.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Factory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Directory\Model\Currency\Import;
class Factory
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
index 7bb28d2acc8..f4e1763b885 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Currency rate import model (From www.webservicex.net)
*/
diff --git a/app/code/Magento/Directory/Model/Resource/Country/Collection.php b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
index c382f1089b5..d328c2dc28f 100644
--- a/app/code/Magento/Directory/Model/Resource/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Directory Country Resource Collection
*/
diff --git a/app/code/Magento/Directory/Model/Resource/Region.php b/app/code/Magento/Directory/Model/Resource/Region.php
index 7ba5179fa82..4f941f951c5 100644
--- a/app/code/Magento/Directory/Model/Resource/Region.php
+++ b/app/code/Magento/Directory/Model/Resource/Region.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Directory Region Resource Model
*/
diff --git a/app/code/Magento/Directory/view/frontend/templates/currency.phtml b/app/code/Magento/Directory/view/frontend/templates/currency.phtml
index c1e14282366..309df630937 100644
--- a/app/code/Magento/Directory/view/frontend/templates/currency.phtml
+++ b/app/code/Magento/Directory/view/frontend/templates/currency.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml b/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
index 1689b70cb04..1e2bea31346 100644
--- a/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
+++ b/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<p><?php echo __('Your current currency is: %1.', $currency->getCode()) ?></p>
<p><a href="<?php echo $this->getBaseUrl(); ?>" class="action continue"><span><?php echo __('Continue') ?></span></a></p>
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
index 88dbba4d548..140f2b53b49 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable;
use Magento\Downloadable\Model\Link\Purchased;
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
index a8dd75adeb9..cdf1ca310c8 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Block\Catalog\Product;
use Magento\Downloadable\Model\Resource\Sample;
diff --git a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
index ef08619fa24..a9e78dee382 100644
--- a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
+++ b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Block\Customer\Products;
use Magento\Downloadable\Model\Link\Purchased\Item;
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index 60fd876e575..90afafa070a 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Block\Sales\Order\Email\Items;
use Magento\Downloadable\Model\Link\Purchased;
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
index 449554f610a..e55486a1887 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Block\Sales\Order\Email\Items\Order;
use Magento\Downloadable\Model\Link\Purchased\Item;
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
index cb15e958f12..61b32968273 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Block\Sales\Order\Item\Renderer;
use Magento\Downloadable\Model\Link\Purchased;
diff --git a/app/code/Magento/Downloadable/Controller/Customer/Products.php b/app/code/Magento/Downloadable/Controller/Customer/Products.php
index d1fc8beecbb..ec9f9fcade4 100644
--- a/app/code/Magento/Downloadable/Controller/Customer/Products.php
+++ b/app/code/Magento/Downloadable/Controller/Customer/Products.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Controller\Customer;
use Magento\Framework\App\RequestInterface;
diff --git a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
index 1a8864ed182..f03b3de46fe 100644
--- a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
+++ b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Helper\Catalog\Product;
/**
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index 2efd55ef364..ca073b90471 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Helper;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
index 21be2eae6bc..54e67bbf583 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Model\Sales\Order\Pdf\Items;
/**
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
index b9b726e3e26..899298ee5ff 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Downloadable\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Downloadable */ ?>
<?php $_linksPurchasedSeparately = $this->getLinksPurchasedSeparately(); ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
index faf39261b3d..b2106cc4eaa 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
index a6ec0c51425..e4a45d29568 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
index 077837d6bda..1896a064caf 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
index c6e755ef89e..f3ddf20f18d 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($_item = $this->getItem()): ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
index cba0dd9dfcb..582abcb2de0 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($_item = $this->getItem()): ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
index 90c9582901d..984a9de8f22 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($_item = $this->getItem()): ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
index 326554bbd32..7be7d7c676f 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Downloadable\Block\Catalog\Product\Links */ ?>
<?php $_linksPurchasedSeparately = $this->getLinksPurchasedSeparately(); ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
index b179dfe188d..0c162526ec2 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Downloadable product links
*
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
index 72953983dd3..59933ac0d2d 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Downloadable product type
*
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/checkout/cart/item/default.phtml b/app/code/Magento/Downloadable/view/frontend/templates/checkout/cart/item/default.phtml
index c3f11cd169a..ff116091174 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/checkout/cart/item/default.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/checkout/cart/item/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
$_item = $this->getItem();
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/checkout/links.phtml b/app/code/Magento/Downloadable/view/frontend/templates/checkout/links.phtml
index 156964a739f..6b5c05b8c5b 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/checkout/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/checkout/links.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($links = $this->getLinks()): ?>
<dl class="cart item options">
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
index 2084b189534..5876330ebda 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getOrderHasDownloadable()): ?>
<?php echo __('Go to <a href="%1">My Downloadable Products</a>', $this->getDownloadableProductsUrl()) ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
index 64a8f637191..345b5595268 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
index 5f859dba712..7db2f4dcf16 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
index b87afc9266a..b1fb4678bd9 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
index 57eebb03175..542dd88e4c4 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Downloadable\Block\Sales\Order\Email\Items\Order\Downloadable */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml b/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
index a5bd2a22ede..1941a836ba4 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
index d087699cc11..4fc0c6dccd8 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
index becaabbf76c..759179a1193 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index b75bfeab278..5fd3eca4c9b 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Product attribute add/edit form main tab
*
diff --git a/app/code/Magento/Eav/Helper/Data.php b/app/code/Magento/Eav/Helper/Data.php
index 2c283d95330..d09f95a40ca 100644
--- a/app/code/Magento/Eav/Helper/Data.php
+++ b/app/code/Magento/Eav/Helper/Data.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Helper;
/**
diff --git a/app/code/Magento/Eav/Model/Attribute.php b/app/code/Magento/Eav/Model/Attribute.php
index 34cb0c6c5dc..f38ac881adf 100644
--- a/app/code/Magento/Eav/Model/Attribute.php
+++ b/app/code/Magento/Eav/Model/Attribute.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* EAV attribute resource model (Using Forms)
*
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
index 27dff63da40..15d45d12feb 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Attribute\Data;
use Magento\Framework\App\RequestInterface;
diff --git a/app/code/Magento/Eav/Model/AttributeDataFactory.php b/app/code/Magento/Eav/Model/AttributeDataFactory.php
index 3e69316fcfa..fc35af0da10 100644
--- a/app/code/Magento/Eav/Model/AttributeDataFactory.php
+++ b/app/code/Magento/Eav/Model/AttributeDataFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model;
/**
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index aab51c7333d..59c36e1a1f0 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Entity;
use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php
index bedc1ee81be..196c707e7a2 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Entity\Attribute\Backend;
use Magento\Eav\Exception as EavException;
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
index b35370fcd49..ff888017617 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Entity\Attribute\Frontend;
class Datetime extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
index f386155a979..fa7a2520d6d 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (!$this->getEditMode()): ?>
<form action="<?php echo $this->getLoadUrl() ?>" method="post" id="email_template_load_form">
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml
index f21550eb169..e97b32003cb 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="page-actions"><?php echo $this->getChildHtml('add_button') ?></div>
<?php echo $this->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index 42e80b5d504..acd25bd1611 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Fedex\Model;
use Magento\Sales\Model\Quote\Address\RateRequest;
diff --git a/app/code/Magento/GiftMessage/Helper/Message.php b/app/code/Magento/GiftMessage/Helper/Message.php
index 31045f4063e..e3072fd5d59 100644
--- a/app/code/Magento/GiftMessage/Helper/Message.php
+++ b/app/code/Magento/GiftMessage/Helper/Message.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GiftMessage\Helper;
/**
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
index 6bf0315e9a6..310bebbb254 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->canDisplayGiftmessageForm()): ?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
index 1322070685b..2471c21fdf9 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getChildHtml()) :?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
index 1ba3e1b8d67..c263ecbd5a5 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
index 65342e2aee9..402c7ddb617 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->canDisplayGiftMessage()): ?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
index 5a9677792c6..6fa1f494462 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_childHtml = trim($this->getChildHtml('', false)); ?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
index 81dbd92b8cd..5435ae8d8dc 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->canDisplayGiftmessage()): ?>
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index d2166f8652c..ac5ea1a59a8 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_giftMessage = false; ?>
<?php switch ($this->getCheckoutType()): ?>
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
index 7a4eac437ad..8b10a6e2932 100644
--- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleAnalytics\Block;
/**
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index 2a1eff33235..8a9e6af494e 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleAnalytics\Helper;
use Magento\Store\Model\Store;
diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
index 34df717bb6c..3cacc7cacfa 100644
--- a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
+++ b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\GoogleAnalytics\Block\Ga */ ?>
<?php if (!$this->helper('Magento\Store\Helper\Cookie')->isUserNotAllowSaveCookie()): ?>
diff --git a/app/code/Magento/GoogleOptimizer/Block/Code/Category.php b/app/code/Magento/GoogleOptimizer/Block/Code/Category.php
index f422c147581..dab0b107d3f 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Code/Category.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Code/Category.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleOptimizer\Block\Code;
class Category extends \Magento\GoogleOptimizer\Block\AbstractCode implements \Magento\Framework\View\Block\IdentityInterface
diff --git a/app/code/Magento/GoogleOptimizer/Block/Code/Product.php b/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
index fcd2e2b788d..820f1df8961 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleOptimizer\Block\Code;
class Product extends \Magento\GoogleOptimizer\Block\AbstractCode implements \Magento\Framework\View\Block\IdentityInterface
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Data.php b/app/code/Magento/GoogleOptimizer/Helper/Data.php
index f4acf980c83..ae1da817379 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Data.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Data.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleOptimizer\Helper;
class Data extends \Magento\Framework\App\Helper\AbstractHelper
diff --git a/app/code/Magento/GoogleOptimizer/Model/Observer/Block/Category/Tab.php b/app/code/Magento/GoogleOptimizer/Model/Observer/Block/Category/Tab.php
index 62507ff8e17..7594ce711ea 100644
--- a/app/code/Magento/GoogleOptimizer/Model/Observer/Block/Category/Tab.php
+++ b/app/code/Magento/GoogleOptimizer/Model/Observer/Block/Category/Tab.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleOptimizer\Model\Observer\Block\Category;
use Magento\Framework\Event\Observer as EventObserver;
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php
index 82e0b208702..55e45907c98 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Block\Adminhtml\Items;
/**
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 a4d0d85baec..ccb228e0878 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\Items;
use Magento\Backend\App\Action;
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Refresh.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Refresh.php
index 8d9a12f1ee3..da17b264b89 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Refresh.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Refresh.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\Items;
class Refresh extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\Items
diff --git a/app/code/Magento/GoogleShopping/Helper/Category.php b/app/code/Magento/GoogleShopping/Helper/Category.php
index b3b545629e5..792ac6cfaf8 100644
--- a/app/code/Magento/GoogleShopping/Helper/Category.php
+++ b/app/code/Magento/GoogleShopping/Helper/Category.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Helper;
/**
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/DefaultAttribute.php b/app/code/Magento/GoogleShopping/Model/Attribute/DefaultAttribute.php
index c0ed3c62b4d..aab7e53702c 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/DefaultAttribute.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/DefaultAttribute.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Default attribute model
*
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
index dcc81a1a9ab..69ab21bdd6a 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Model\Attribute;
use Magento\Catalog\Model\Product;
diff --git a/app/code/Magento/GoogleShopping/Model/Config.php b/app/code/Magento/GoogleShopping/Model/Config.php
index 41be2b38879..a3095ce40ba 100644
--- a/app/code/Magento/GoogleShopping/Model/Config.php
+++ b/app/code/Magento/GoogleShopping/Model/Config.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Model;
/**
diff --git a/app/code/Magento/GoogleShopping/Model/Resource/Attribute/Collection.php b/app/code/Magento/GoogleShopping/Model/Resource/Attribute/Collection.php
index e2eb66de035..279ccd93327 100644
--- a/app/code/Magento/GoogleShopping/Model/Resource/Attribute/Collection.php
+++ b/app/code/Magento/GoogleShopping/Model/Resource/Attribute/Collection.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Model\Resource\Attribute;
/**
diff --git a/app/code/Magento/GoogleShopping/Model/Resource/Grid/Collection.php b/app/code/Magento/GoogleShopping/Model/Resource/Grid/Collection.php
index c10f42d0128..b6dde9031cf 100644
--- a/app/code/Magento/GoogleShopping/Model/Resource/Grid/Collection.php
+++ b/app/code/Magento/GoogleShopping/Model/Resource/Grid/Collection.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* GoogleShopping Types collection
*
diff --git a/app/code/Magento/GoogleShopping/Model/Service.php b/app/code/Magento/GoogleShopping/Model/Service.php
index f1a9814e9c2..bae461dc251 100644
--- a/app/code/Magento/GoogleShopping/Model/Service.php
+++ b/app/code/Magento/GoogleShopping/Model/Service.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Model;
/**
diff --git a/app/code/Magento/GoogleShopping/Model/Source/Destinationstates.php b/app/code/Magento/GoogleShopping/Model/Source/Destinationstates.php
index 9b3ac0a0084..87cf42670d2 100644
--- a/app/code/Magento/GoogleShopping/Model/Source/Destinationstates.php
+++ b/app/code/Magento/GoogleShopping/Model/Source/Destinationstates.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Model\Source;
/**
diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/templates/captcha.phtml b/app/code/Magento/GoogleShopping/view/adminhtml/templates/captcha.phtml
index 40872fb9898..2dbfab84deb 100644
--- a/app/code/Magento/GoogleShopping/view/adminhtml/templates/captcha.phtml
+++ b/app/code/Magento/GoogleShopping/view/adminhtml/templates/captcha.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getGcontentCaptchaToken() && $this->getGcontentCaptchaUrl()): ?>
diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit.phtml b/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit.phtml
index 413d8912319..e4522f4ee07 100644
--- a/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit.phtml
+++ b/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/attributes.phtml b/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/attributes.phtml
index 2f30af6148a..8e7874fdb9a 100644
--- a/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/attributes.phtml
+++ b/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/attributes.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getAttributeSetSelected()): ?>
diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/select.phtml b/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/select.phtml
index f96ab95b15b..12d6240c2a3 100644
--- a/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/select.phtml
+++ b/app/code/Magento/GoogleShopping/view/adminhtml/templates/types/edit/select.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<select id="<?php echo $this->getId() ?>" name="<?php echo $this->getName() ?>" class="<?php echo $this->getClass() ?>" title="">
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
index 4a56a6d0201..313e4d7609f 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped */ ?>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
index cc004245ca1..606ffd2db79 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Framework\View\Element\Template */
/** @var $this \Magento\Framework\View\Element\Template */
diff --git a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
index 32f56c0335d..4fd443ebd0e 100644
--- a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Template for displaying grouped product price
*/
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
index bc523529d2b..101b03c27ad 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Catalog\Block\Product\View\AbstractView */?>
<?php $_product = $this->getProduct() ?>
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
index d967773835b..d7b5be26440 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Grouped product data template
*
diff --git a/app/code/Magento/ImportExport/Helper/Data.php b/app/code/Magento/ImportExport/Helper/Data.php
index 35b01913433..a78aa24f6f5 100644
--- a/app/code/Magento/ImportExport/Helper/Data.php
+++ b/app/code/Magento/ImportExport/Helper/Data.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ImportExport\Helper;
/**
diff --git a/app/code/Magento/ImportExport/Model/Export.php b/app/code/Magento/ImportExport/Model/Export.php
index d4555391afd..10086e5d375 100644
--- a/app/code/Magento/ImportExport/Model/Export.php
+++ b/app/code/Magento/ImportExport/Model/Export.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ImportExport\Model;
/**
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php b/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php
index 2b1be05028d..a4b1ce26bb1 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Factory.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Export entity factory
*/
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 00d0d4e6710..1391395f6ce 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ImportExport\Model;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php b/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php
index a0b66d93451..534a9a956a9 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Factory.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Import entity factory
*/
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
index f21c7f420bf..7eebfd9c028 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
@@ -6,5 +6,8 @@
*
* @var \Magento\Backend\Block\Template $this
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div><p><?php echo __("Please setup or sign in into your 3rd party account to complete setup of this integration."); ?></p></div>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
index 113ab36c993..a0a41bca4fa 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
index 2be4ce8e96c..729e92d1be0 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
index 6f6e77d8237..784dc05e886 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Log/Model/Resource/Visitor/Online.php b/app/code/Magento/Log/Model/Resource/Visitor/Online.php
index be4001bac13..26b2d2d5f97 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor/Online.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor/Online.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Log\Model\Resource\Visitor;
/**
diff --git a/app/code/Magento/Log/view/adminhtml/templates/customer/status.phtml b/app/code/Magento/Log/view/adminhtml/templates/customer/status.phtml
index d194d71f65f..075377b3b1d 100644
--- a/app/code/Magento/Log/view/adminhtml/templates/customer/status.phtml
+++ b/app/code/Magento/Log/view/adminhtml/templates/customer/status.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Template for block \Magento\Log\Block\Adminhtml\Customer\Edit\Tab\View\Status
*/
diff --git a/app/code/Magento/Log/view/adminhtml/templates/online.phtml b/app/code/Magento/Log/view/adminhtml/templates/online.phtml
index d446e7eaee5..26850ee918e 100644
--- a/app/code/Magento/Log/view/adminhtml/templates/online.phtml
+++ b/app/code/Magento/Log/view/adminhtml/templates/online.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index bfe801cccb8..e74bb547f20 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Template for displaying product price at product view page, gift registry and wish-list
*
diff --git a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
index ee3ec7be46e..d61236583e9 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Msrp\Block\Popup $this */
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
index 9979e1bb584..75097e82228 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
index e4ee99a8851..9b8f6510f2e 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Multishipping/Helper/Data.php b/app/code/Magento/Multishipping/Helper/Data.php
index fe169a55d15..92443ba7a48 100644
--- a/app/code/Magento/Multishipping/Helper/Data.php
+++ b/app/code/Magento/Multishipping/Helper/Data.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Helper;
/**
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index f8366b4b746..1a897fe5fc2 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Model\Checkout\Type;
use Magento\Customer\Api\AddressRepositoryInterface;
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
index e0ef6d0cfea..b8cf32fd4bf 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Multishipping\Block\Checkout\Address\Select $this */
?>
<div class="multicheckout">
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
index 1d14b7d4ab2..040ee3d8cd0 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
index 1abfdde62aa..3fa83ad0a73 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
index a10fd958370..7c2f483c605 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getQuote()->hasVirtualItems()): ?>
<div class="block block-other">
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
index da88fce05fe..3f2e0ccf6e6 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<strong class="product name product-item-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></strong>
<?php if ($_options = $this->getOptionList()): ?>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
index dc3aad22a5f..8c777825062 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<a class="action multicheckout" href="<?php echo $this->getCheckoutUrl()?>" title="<?php echo __('Checkout with Multiple Addresses');?>"><span><?php echo __('Checkout with Multiple Addresses');?></span></a>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
index e0b908a5a0e..d5b6400097c 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="review-order-form" data-mage-init='{"orderOverview": {}}' class="form multicheckout order-review">
<?php echo $this->getBlockHtml('formkey'); ?>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
index 7d00a603a54..6ee611275c8 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
index 455d4ac40e3..0554bc601f7 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
index e57a5ff45e8..6eaac144936 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
index fef56ef0c7a..88e71617a42 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="multicheckout success">
<h2 class="subtitle"><?php echo __('Thank you for your purchase!') ?></h2>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
index 75203ad64d3..7340932a0e5 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="product details">
<strong class="product name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></strong>
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
index 511c0b44b4a..a2589666709 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Newsletter\Block\Adminhtml\Queue\Edit;
/**
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index 8f7674d8a1b..54b1c99aba0 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Newsletter Template Edit Block
*
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
index f6dc01385e4..fc66ca0bdfc 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Newsletter\Controller\Adminhtml\Queue;
class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue
diff --git a/app/code/Magento/Newsletter/Model/Resource/Grid/Collection.php b/app/code/Magento/Newsletter/Model/Resource/Grid/Collection.php
index 74ee11375f4..2c6863654c8 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Grid/Collection.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Grid/Collection.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Newsletter problems collection
*
diff --git a/app/code/Magento/Newsletter/Model/Resource/Template.php b/app/code/Magento/Newsletter/Model/Resource/Template.php
index 5a301cee8dc..f74165d7be9 100644
--- a/app/code/Magento/Newsletter/Model/Resource/Template.php
+++ b/app/code/Magento/Newsletter/Model/Resource/Template.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Newsletter\Model\Resource;
/**
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
index 44c2d72ca23..935d3eece31 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div id="preview" class="cms-revision-preview">
<div class="toolbar">
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
index 33a1ba8d67c..a974d63832c 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($websites = $this->getWebsites()): ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
index d4a1be5154d..9c0badadde1 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
index 13814175625..c287058e404 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Newsletter\Block\Adminhtml\Queue\Edit */
?>
<div class="page-actions">
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
index 758e619d385..7c2de12b44d 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml('grid'); ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
index 7c48786418a..e806bd0ada5 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml('grid') ?>
<?php if (count($this->getQueueAsOptions())>0 && $this->getShowQueueAdd()): ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
index 7e1bc32c1e0..ed3488b7586 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Newsletter\Block\Adminhtml\Template\Edit */
?>
<form action="<?php echo $this->getSaveUrl() ?>" method="post" id="newsletter_template_edit_form">
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
index d446e7eaee5..26850ee918e 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml b/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
index d53d0c501c9..c550e269158 100644
--- a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="block newsletter">
<div class="title"><strong>Newsletter</strong></div>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
index a0caf19b3fe..b30fede309c 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($instructions = $this->getInstructions()): ?>
<ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
index a9b75a73efd..6a985d49748 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\OfflinePayments\Block\Form\Cashondelivery
*/
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
index 950cb3e4650..19494ad6f23 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<fieldset class="fieldset payment method" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none">
<?php if ($this->getMethod()->getPayableTo()): ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
index a2052716743..04450ad8600 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<fieldset class="fieldset payment method" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none">
<div class="field field-number required">
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
index 02135b9bd9f..f23d494e4de 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?>
<?php if ($this->getInfo()->getAdditionalData()): ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
index 30a7fa5b3f2..17f92446862 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?>
{{pdf_row_separator}}
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
index 6b6dad86dea..0f128fc4300 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($instructions = $this->getInstructions()): ?>
<div class="items <?php echo $this->getMethodCode() ?> instructions agreement content" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display: none;">
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
index 62a4c36e5d3..b203c318e86 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @see \Magento\OfflinePayments\Block\Form\Cashondelivery
*/
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
index cfd2fc328e4..d58f4d569c5 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getMethod()->getMailingAddress() || $this->getMethod()->getPayableTo()): ?>
<dl class="items check payable" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
index c5573da40a5..e723450bd71 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<fieldset class="fieldset items <?php echo $this->getMethodCode() ?>" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display: none">
<div class="field number required">
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
index e03520ebba5..3a028d8d9e9 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<dl class="payment-method checkmemo">
<dt class="title"><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></dt>
diff --git a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
index 21d23a56374..eb1db1026ce 100644
--- a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Checkout cart shipping block plugin
*
diff --git a/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml b/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index 1261f429355..eeb33441e6c 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Payment\Model\Method;
use Magento\Payment\Model\Checks\PaymentMethodChecksInterface;
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
index 095cfba6dad..7c1ee601478 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_code = $this->getMethodCode() ?>
<fieldset class="fieldset payment method" id="payment_form_<?php echo $_code ?>" style="display:none">
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
index 7e1284aa40d..277c645043e 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
index d40d7c99fb8..214c01fc2fd 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
index 31aba635836..17a383897ff 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
index efc3e14c003..bd9c8864abe 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div><?php echo __('%1 is not available. You still can process offline actions.', $this->escapeHtml($this->getMethod()->getTitle())) ?></div>
diff --git a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
index 381f63f6ba9..b2cb2922c14 100644
--- a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_code = $this->getMethodCode() ?>
<fieldset class="fieldset payment items ccard <?php echo $_code ?>" id="payment_form_<?php echo $_code ?>" style="display: none;">
diff --git a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
index f72277eb033..e72a7db8b2f 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
index 4578445a580..0b86114aa42 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml b/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
index 963b0b303b1..0989f4badb1 100644
--- a/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
+++ b/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php b/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
index 25cdfd3fe4f..2fd4d4c5bbf 100644
--- a/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
+++ b/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ProductAlert\Block\Email;
use Magento\Framework\Pricing\PriceCurrencyInterface;
diff --git a/app/code/Magento/ProductAlert/Model/Resource/Price.php b/app/code/Magento/ProductAlert/Model/Resource/Price.php
index 786460ccb58..f414b0399f9 100644
--- a/app/code/Magento/ProductAlert/Model/Resource/Price.php
+++ b/app/code/Magento/ProductAlert/Model/Resource/Price.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ProductAlert\Model\Resource;
/**
diff --git a/app/code/Magento/ProductAlert/Model/Resource/Stock.php b/app/code/Magento/ProductAlert/Model/Resource/Stock.php
index 69757090fe0..0c11463f35a 100644
--- a/app/code/Magento/ProductAlert/Model/Resource/Stock.php
+++ b/app/code/Magento/ProductAlert/Model/Resource/Stock.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ProductAlert\Model\Resource;
/**
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
index 0057aab7aa8..19d1fe4829a 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\ProductAlert\Block\Email\Price */
?>
<?php if ($_products = $this->getProducts()): ?>
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
index ef2e54319e9..2929072d9db 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\ProductAlert\Block\Email\Stock */
?>
<?php if ($_products = $this->getProducts()): ?>
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
index c70792b3b7d..af43aba1250 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Adminhtml\Filter;
/**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
index b8f61390531..2d9b1a9c3cb 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Adminhtml;
/**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
index 589babea74d..4c35712dee5 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
/**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
index 38d3beec3ad..82552c5ecc7 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Adminhtml\Sales\Invoiced;
/**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
index 13eaebac77f..2bb43e23e23 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Adminhtml\Sales\Refunded;
/**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
index e6518ab8daa..3ea21242098 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
/**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
index 2c36b41b634..22c68d6239e 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Adminhtml\Sales\Shipping;
/**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
index bc26a7aa772..41a1496dcc0 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Adminhtml\Sales\Tax;
/**
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
index f8f00d0359b..c50cb761fe9 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Adminhtml;
/**
diff --git a/app/code/Magento/Reports/Block/Product/Compared.php b/app/code/Magento/Reports/Block/Product/Compared.php
index df1806c11eb..0651603c16a 100644
--- a/app/code/Magento/Reports/Block/Product/Compared.php
+++ b/app/code/Magento/Reports/Block/Product/Compared.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Product;
/**
diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php
index 3d04074d380..f0fcfaedf29 100644
--- a/app/code/Magento/Reports/Block/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Product/Viewed.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Block\Product;
/**
diff --git a/app/code/Magento/Reports/Helper/Data.php b/app/code/Magento/Reports/Helper/Data.php
index dbc868823e0..f55f55e7e42 100644
--- a/app/code/Magento/Reports/Helper/Data.php
+++ b/app/code/Magento/Reports/Helper/Data.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Reports data helper
*/
diff --git a/app/code/Magento/Reports/Model/DateFactory.php b/app/code/Magento/Reports/Model/DateFactory.php
index b271d5d276e..0f244ecd8e1 100644
--- a/app/code/Magento/Reports/Model/DateFactory.php
+++ b/app/code/Magento/Reports/Model/DateFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Model;
class DateFactory
diff --git a/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php
index 2b83d5ed6a7..29305569112 100644
--- a/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/Resource/Entity/Summary/Collection/AbstractCollection.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Reports summary collection
*
diff --git a/app/code/Magento/Reports/Model/Resource/Order/Collection.php b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
index ce22dd6b495..842d1c99fb6 100644
--- a/app/code/Magento/Reports/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Model\Resource\Order;
use Magento\Framework\DB\Select;
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Resource/Product/Index/AbstractIndex.php
index 630fd2ca978..c09f169bdc7 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Index/AbstractIndex.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Index/AbstractIndex.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Model\Resource\Product\Index;
/**
diff --git a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
index 50a0031ab5f..1cbb1e8ad2f 100644
--- a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Reports quote collection
*
diff --git a/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php b/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php
index e52ccfcba2d..9a02448ae02 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Model\Resource\Report;
/**
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
index 49b2e991485..a4b3afce59c 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Most viewed product report aggregate resource model
*
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
index 322f2672dd0..949e590dfcb 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Report most viewed collection
*/
diff --git a/app/code/Magento/Reports/data/reports_setup/data-install-2.0.0.php b/app/code/Magento/Reports/data/reports_setup/data-install-2.0.0.php
index 9a757eefedd..42efcf641c4 100644
--- a/app/code/Magento/Reports/data/reports_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Reports/data/reports_setup/data-install-2.0.0.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $installer \Magento\Reports\Model\Resource\Setup */
$installer = $this;
/*
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index 9177665ad96..93c0e9f8267 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var $this \Magento\Reports\Block\Adminhtml\Grid */
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
index 1e195c0d2b5..cf4099dafa6 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="reports-content">
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml
index f402f631970..5e5f565f376 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="page-actions"><?php echo $this->getButtonsHtml() ?></div>
<?php echo $this->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
index f4245f6886d..4e190b604b6 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
index dace3ba2fd5..e8e2331757f 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Reports/view/frontend/templates/js/components.phtml b/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
index 5d58c3f3f27..a5de72bd43d 100644
--- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Reports\Block\Product\Widget\Viewed */
?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
index 3bf84970fcb..8bc88f7b483 100644
--- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Reports\Block\Product\Widget\Viewed\Item */
?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
index 09568d162a6..0b60d456a10 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
if ($exist = $this->getRecentlyComparedProducts()) {
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
index b359b234abb..e6b1b6d2ac5 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
if ($exist = $this->getRecentlyComparedProducts()) {
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
index ebd6bfdf55e..31c7b6dc453 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
<div class="block widget block-compared-products-names">
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
index c26b9f6e768..9576e984570 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
index 9033fa3bfe5..444bd13efcb 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
index 584ffdc88a9..4193f2697de 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
index 351e92b2d24..dbd8cd98cdd 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
index a082370dbd0..909e8aa65d1 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
index b5313c7e613..84a0c8428ec 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
index c352b463f3d..f07e3bc5a1e 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
index e4e67dea6b3..03588d6af6a 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Review\Block\Adminhtml;
/**
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
index 0e0542f0c13..a73a35d27f3 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Adminhtml reviews grid
*
diff --git a/app/code/Magento/Review/Helper/Action/Pager.php b/app/code/Magento/Review/Helper/Action/Pager.php
index f6569d1d3e0..de47f0b1b02 100644
--- a/app/code/Magento/Review/Helper/Action/Pager.php
+++ b/app/code/Magento/Review/Helper/Action/Pager.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Review\Helper\Action;
use Magento\Framework\Model\Exception;
diff --git a/app/code/Magento/Review/Helper/Data.php b/app/code/Magento/Review/Helper/Data.php
index 4174eccc53d..9b1dd906314 100644
--- a/app/code/Magento/Review/Helper/Data.php
+++ b/app/code/Magento/Review/Helper/Data.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Review\Helper;
/**
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
index e87f63b0174..68f16846ce8 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getRating() && $this->getRating()->getSize()): ?>
<div class="nested">
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 0f4b8c6bd6d..c0f4ea304a0 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="message info">
<div><?php echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml
index 0ab7a3b4de2..3d5a1c0c009 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="entry-edit-head">
<h4 class="icon-head head-edit-form fieldset-legend"><?php echo __('Assigned Options') ?></h4>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml
index 4ec6674c39b..d32974f321e 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getRating() && $this->getRating()->getSize()): ?>
<div class="ratings-container">
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
index 7716d00fbd4..0d4c03f154e 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getRatingSummary()->getCount()): ?>
<div class="rating-box">
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
index 6419f60be39..ccbfb102d96 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Review\Block\Adminhtml\Grid\Rss\Link */
?>
<?php if ($this->isRssAllowed() && $this->getLink()): ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
index 94054fc4fe4..d8e8aef972c 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getCollection() && $this->count()): ?>
<div class="table-wrapper reviews">
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
index 161ed7f6b3b..de795d1cce0 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
index a6a19b0e2a4..653f8aae0fb 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getProductData()->getId()): ?>
<?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/detailed.phtml b/app/code/Magento/Review/view/frontend/templates/detailed.phtml
index fdb61786f7b..cd663213fa9 100644
--- a/app/code/Magento/Review/view/frontend/templates/detailed.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/detailed.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (!empty($collection) && $collection->getSize()): ?>
<div class="table-wrapper">
diff --git a/app/code/Magento/Review/view/frontend/templates/form.phtml b/app/code/Magento/Review/view/frontend/templates/form.phtml
index 25f20f4d2fa..a4deea40cc0 100644
--- a/app/code/Magento/Review/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Review\Block\Form
*/
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
index 76be7566071..ecc695d9b51 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $url = $this->getReviewsUrl() . '#reviews'; ?>
<?php $urlForm = $this->getReviewsUrl() . '#review-form'; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
index d89c9ef7b0b..a6a4f5eda7d 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $url = $this->getReviewsUrl() . '#reviews'; ?>
<?php $urlForm = $this->getReviewsUrl() . '#review-form'; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml
index 9dd9d50e13a..46a99525725 100644
--- a/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (!empty($count)):?>
<a href="#customer-reviews" class="nobr"><?php echo __('%1 Review(s)', $count) ?></a>
diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
index 3cdf1a211cd..1d84497c0ae 100644
--- a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml
index ea8ec1c0314..d09c42cad3b 100644
--- a/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Review\Block\Product\View\Other */ ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/redirect.phtml b/app/code/Magento/Review/view/frontend/templates/redirect.phtml
index 761e33d93c1..5611ccbb5f3 100644
--- a/app/code/Magento/Review/view/frontend/templates/redirect.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/redirect.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/* if(isset($GET['limit'])) {
diff --git a/app/code/Magento/Review/view/frontend/templates/view.phtml b/app/code/Magento/Review/view/frontend/templates/view.phtml
index da96f08fb51..ebd70fcaf18 100644
--- a/app/code/Magento/Review/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/view.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getProductData()->getId()): ?>
<div class="product-review">
diff --git a/app/code/Magento/Rss/view/frontend/templates/feeds.phtml b/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
index f3a591f456e..6e13f8dc8e1 100644
--- a/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
+++ b/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<table class="data table rss">
<caption class="table-caption"><?php echo __('Feed'); ?></caption>
diff --git a/app/code/Magento/Rule/Model/AbstractModel.php b/app/code/Magento/Rule/Model/AbstractModel.php
index cff0edf79a2..dd193d7d2e8 100644
--- a/app/code/Magento/Rule/Model/AbstractModel.php
+++ b/app/code/Magento/Rule/Model/AbstractModel.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Abstract Rule entity data model
*/
diff --git a/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php b/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php
index 767f850e2ec..ae03a9aeb69 100644
--- a/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Api;
/**
diff --git a/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php b/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php
index 5b647f2886c..d95815dd523 100644
--- a/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php
+++ b/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Api;
/**
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
index b2b02ee6b00..0f5871a9c64 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Api\Data;
/**
diff --git a/app/code/Magento/Sales/Api/OrderManagementInterface.php b/app/code/Magento/Sales/Api/OrderManagementInterface.php
index 0d32179b90f..ec90f4bd277 100644
--- a/app/code/Magento/Sales/Api/OrderManagementInterface.php
+++ b/app/code/Magento/Sales/Api/OrderManagementInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Api;
/**
diff --git a/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php
index bb832f7f15b..7e8f3570896 100644
--- a/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Api;
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
index 2db7a175216..8ab3b2d2e63 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Block\Adminhtml\Order\Invoice;
/**
diff --git a/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php b/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
index 9d7dc71e8b6..ccdfd7e6580 100644
--- a/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
+++ b/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Block\Order\Creditmemo;
use Magento\Sales\Model\Order\Creditmemo;
diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
index af07fc6f6c1..b4587540980 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Block\Order\Item\Renderer;
use Magento\Sales\Model\Order\CreditMemo\Item as CreditMemoItem;
diff --git a/app/code/Magento/Sales/Helper/Reorder.php b/app/code/Magento/Sales/Helper/Reorder.php
index 34d5c0b6fd9..cebabfd67ac 100644
--- a/app/code/Magento/Sales/Helper/Reorder.php
+++ b/app/code/Magento/Sales/Helper/Reorder.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Helper;
/**
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 68ef0a37779..5e066409466 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\AdminOrder;
use Magento\Customer\Api\AddressMetadataInterface;
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 7002d8eb093..12935e98f01 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order;
use Magento\Framework\Api\AttributeDataBuilder;
diff --git a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
index 18c1082bce0..cc6092272f9 100644
--- a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order\Email;
use Magento\Sales\Model\Order;
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 43f6ef48533..dd1f4ead7ce 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order;
use Magento\Framework\Api\AttributeDataBuilder;
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index 9114cf39237..0499e74c01b 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order\Payment;
use Magento\Framework\Api\AttributeDataBuilder;
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index e053da1df33..c6fd1ad7b99 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order\Pdf;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
index 6676f2cce6b..1fd18c1b367 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order\Pdf\Total;
/**
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
index a608d8f5016..9eeb2193402 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order\Shipment;
use Magento\Framework\Api\AttributeDataBuilder;
diff --git a/app/code/Magento/Sales/Model/Quote.php b/app/code/Magento/Sales/Model/Quote.php
index 7d88bdcc0e4..aa5c83060c8 100644
--- a/app/code/Magento/Sales/Model/Quote.php
+++ b/app/code/Magento/Sales/Model/Quote.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model;
use Magento\Customer\Api\Data\CustomerInterface;
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php b/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php
index 95a40c1bea9..e6b600e7eca 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/Collector.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Quote\Address\Total;
/**
diff --git a/app/code/Magento/Sales/Model/Quote/Item.php b/app/code/Magento/Sales/Model/Quote/Item.php
index 6c22d70b3b7..03f0888df94 100644
--- a/app/code/Magento/Sales/Model/Quote/Item.php
+++ b/app/code/Magento/Sales/Model/Quote/Item.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Quote;
/**
diff --git a/app/code/Magento/Sales/Model/Resource/Quote.php b/app/code/Magento/Sales/Model/Resource/Quote.php
index 250be344a84..3cfc84af7c4 100644
--- a/app/code/Magento/Sales/Model/Resource/Quote.php
+++ b/app/code/Magento/Sales/Model/Resource/Quote.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Resource;
use Magento\Framework\Model\Resource\Db\AbstractDb;
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
index 4d1c4c36ef1..a2b8ba3e9e1 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Resource\Report\Bestsellers;
/**
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
index 519e5b3e68e..8d3c69444f9 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
index b255146d420..77d5fd1e7fb 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($_item = $this->getItem()): ?>
<table cellspacing="0" class="qty-table">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
index 7d363e70ccc..e57fa265976 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $this */
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
index 9c6650f18ee..20b2cc31a23 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $this */
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
index ca2e21778a2..f97f9a8c938 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $this */
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
index a7bfbcd9617..c5589d01e83 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getItem()->getName() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
index 1c46d142149..ebc150ed621 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="message message-info">
<div class="message-inner">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
index ada39f1593a..b1b2aa3d32c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($_entity = $this->getEntity()): ?>
<div id="comments_block">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
index eb071a3440c..e313049794a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="fieldset-wrapper-title">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index cb9bef73ec7..79d8b8ae664 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->hasMethods()): ?>
<div id="order-billing_method_form">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
index f93c4f07bb1..65c1bd7eac8 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<!--<h4 class="icon-head fieldset-legend <?php echo $this->getHeaderCssClass() ?>"><?php echo $this->getHeaderText() ?></h4>-->
<label for="order-comment"><?php echo __('Order Comments') ?></label><br />
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
index 9170b2880bf..3fce3b2f108 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
index 82625c1d411..f4eb81b3544 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="page-create-order">
<script type="text/javascript">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
index 7f26d7ff227..58057cb1feb 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form $this */
?>
<form id="edit_form" data-order-config='<?php echo $this->getOrderDataJson() ?>' data-load-base-url="<?php echo $this->getLoadBlockUrl() ?>" action="<?php echo $this->getSaveUrl() ?>" method="post" enctype="multipart/form-data">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index d6e662f5278..7a9c5f8b4d8 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @var \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address|\Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address $this
*/
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
index eda3a0f0dec..b0842fc1767 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('main', $this->getQuote(), $this->getStoreId())): ?>
<?php $_items = $this->getItems(); ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
index 5fdcca863ee..1d5e5921066 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="fieldset-wrapper-title">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index 7f23a13121c..9696739315d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
index fdeabd1b444..1befb76ba03 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid $this */
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
index 0d534bcf45e..5c20a10738c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid $this */
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
index fea0677f5da..ffac0783458 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid $this */
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
index 9cd6c7963fa..82fb4afb665 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<input type="checkbox" name="newsletter:subscribe"> <label for="newsletter:subscribe" style="width: 90%; float: none;"><?php echo __('Subscribe to Newsletter'); ?></label><br/>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
index 68bf81c5536..40fe38703b5 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form */ ?>
<?php $_shippingRateGroups = $this->getShippingRates(); ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
index 1c4913e139a..d5fbf31b575 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar */
?>
<div class="customer-current-activity-inner">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index 6cf88fc1dab..893ab9c9b8e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */ ?>
<div class="create-order-sidebar-block" id="sidebar_data_<?php echo $this->getDataId() ?>">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
index 91b45e7fd67..0485b169647 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Store\Select */ ?>
<div class="store-scope form-inline">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
index 2e104cccf9e..8e4d263c53b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<legend class="legend"><span><?php echo __('Order Totals') ?></span></legend>
<table class="data-table" cellspacing="0">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
index 0f331e6a0af..5b32627562f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<tr class="<?php echo $this->getTotal()->getCode(); ?> row-totals">
<td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
index f2a4cd5a1d0..51ce92e3598 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Tax\Block\Checkout\Grandtotal
* @see \Magento\Tax\Block\Checkout\Grandtotal
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
index c5b290ac5f7..efbc26f196b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Tax\Block\Checkout\Shipping
* @see \Magento\Tax\Block\Checkout\Shipping
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
index fb0a27f446d..71c96cbfbb4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
* @see \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
index f64d1da1839..bbbaa1ca77e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php global $taxIter; $taxIter++; ?>
<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
index eae3da23e55..aa63e877558 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form id="edit_form" method="post" action="<?php echo $this->getSaveUrl() ?>">
<?php echo $this->getBlockHtml('formkey')?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
index 950ee8924e2..0a2c428b5a0 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_items = $this->getCreditmemo()->getAllItems() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
index aff253dff4c..59f46c662a6 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
index 186b5446d5f..06444eb5263 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_source = $this->getSource() ?>
<?php if ($_source): ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
index 8ee3b543057..abbb470f388 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_order = $this->getCreditmemo()->getOrder() ?>
<?php echo $this->getChildHtml('order_info') ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
index 6be4dcb0a2d..158a272adfe 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_items = $this->getCreditmemo()->getAllItems() ?>
<div class="fieldset-wrapper">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
index ba302de8070..d2ceff2c1c3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
index 69c9ab2574b..1368f92200b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/*
store view name = $_order->getStore()->getName()
web site name = $_order->getStore()->getWebsite()->getName()
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
index 51e5e222558..c2fe3ea1aba 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getChildHtml()): ?>
<div class="fieldset-wrapper order-gift-options clearfix">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
index 5035e246171..6f98d653f50 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form id="edit_form" method="post" action="<?php echo $this->getSaveUrl() ?>">
<?php echo $this->getBlockHtml('formkey')?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index 177f53f0197..422a923d1ee 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="fieldset-wrapper">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
index a7c7049e09c..07bd49db823 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
index 980af530e4a..ad12949a6cc 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_invoice = $this->getInvoice() ?>
<?php $_order = $_invoice->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
index ef5544f0780..66b49c171fe 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="grid">
<table cellspacing="0" class="data order-tables">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
index 762891e7b32..b3634df67ac 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
index 46292a943cb..40f83cd7334 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (sizeof($this->getTotals()) > 0): ?>
<table cellspacing="0" class="items-to-invoice">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
index 6bdc2fe5d6d..46f596912bd 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /*$_source = $this->getSource(); ?>
<?php $this->setPriceDataObject($_source) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
index 596aff2434d..5956bddd6cb 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_source = $this->getSource() ?>
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
index 3d02eba8a2d..61103197bf5 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getCanDisplayTotalDue()): ?>
<tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
index 508d1b7aac0..1b95ecf71a7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_source = $this->getSource() ?>
<?php $this->setPriceDataObject($_source) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
index e47869a564b..0623d147361 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_source = $this->getSource() ?>
<?php $this->setPriceDataObject($_source) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
index 967c4928877..d20d7e4bcdc 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getCanDisplayTotalPaid()): ?>
<tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
index 07e5bbed476..b55c9e340d1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getCanDisplayTotalRefunded()): ?>
<tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
index cc5648f8f6b..c277ae9d9a3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_source = $this->getSource() ?>
<?php $this->setPriceDataObject($_source) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index fa722011455..3c3d049033e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Sales\Block\Adminhtml\Order\Totals\Tax */
?>
<?php
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
index ec102d8ebc5..6010922f306 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->canDisplayGiftmessage()): ?>
<?php $_required = $this->getMessage()->getMessage() != ''?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
index f0da4ff39b3..25aed99fcc1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div id="order_history_block">
<?php if ($this->canAddComment()):?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
index 1730a37eafc..dffeab82385 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\View\Info */ ?>
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
index 43c27507f86..08578d38444 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_order = $this->getOrder() ?>
<div class="grid">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
index f5524285298..6458770622c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
index 2cbde7390de..76373d02353 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="fieldset-wrapper">
<ul class="note-list">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index 94e3ea54f1f..8f21bfc33d4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\View\Tab\Info */ ?>
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml b/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
index bc3c624aa2a..5f4b579cdc4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
@@ -4,5 +4,8 @@
* @package default_default
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
index aa146cc2ca2..6c1ff7b5508 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Sales\Block\Adminhtml\Rss\Order\Grid\Link */
?>
<?php if ($this->isRssAllowed() && $this->getLink()): ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
index 1962f3da508..2f50f4cb33f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="page-actions"><?php echo $this->getButtonsHtml() ?></div>
<div class="fieldset-wrapper">
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
index a9249f10557..9c8f3ca2255 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_creditmemo = $this->getCreditmemo() ?>
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
index 50db65c6478..133b13202ff 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_invoice = $this->getInvoice() ?>
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
index 1f0ffd7b2a8..79b72ec2be8 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_order = $this->getOrder() ?>
<?php if ($_order): ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
index 8123dbc48d6..a61e3b7c20b 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_item = $this->getItem() ?>
<?php $_order = $this->getItem()->getOrder(); ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
index 8123dbc48d6..a61e3b7c20b 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_item = $this->getItem() ?>
<?php $_order = $this->getItem()->getOrder(); ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
index a3be386b186..2af89a9cf5d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Sales\Block\Order\Email\Items\DefaultItems */
/** @var $_item \Magento\Sales\Model\Order\Item */
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
index 967646fa004..014a13d59b3 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Sales\Block\Order\Email\Items\DefaultItems $this */
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
index c96af8de1f6..1b38c04936d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_item = $this->getItem() ?>
<tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
index 3d5782e31df..b084de2b18e 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_shipment = $this->getShipment() ?>
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index cbfb62293a7..2fe60b4472f 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_shipment = $this->getShipment() ?>
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
index 6b2b37cc31a..a7a2ce70722 100644
--- a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form class="form form-orders-search" id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{}, "validation":{}}' action="<?php echo $this->getActionUrl() ?>"
method="post" name="guest_post">
diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
index ed5afa8b933..7fdd74e6d72 100644
--- a/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $this */
$_item = $this->getItem();
?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
index d42083696c5..af5fa63203e 100644
--- a/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $this */
$_item = $this->getItem();
?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
index ffd6df9093b..591d0862e9a 100644
--- a/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $this */
$_item = $this->getItem();
?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/js/components.phtml b/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
index dc3ca8a5635..6ef07e872da 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
index 8e96c8edb5e..2fc730a7b31 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_order = $this->getOrder() ?>
<div class="actions-toolbar">
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
index 84e0e1cd018..580b665330e 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
index 0ebbd64381e..e553afd98c4 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_orders = $this->getOrders(); ?>
<?php echo $this->getChildHtml('info');?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
index d1ff5110b9d..841bd59b768 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Order\Info */ ?>
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
index 0990b63c159..523e2aa40a7 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="actions">
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
index fc790dcc09c..db8253f05cf 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Sales\Block\Order\Info\Buttons\Rss */
?>
<?php if ($this->isRssAllowed() && $this->getLink()): ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
index 083a5dac41a..c3fee2c92cf 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_order = $this->getOrder() ?>
<div class="actions-toolbar">
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
index 91d20d726ff..99ae1a8a14e 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */ ?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
index 756e2750df0..3698703edf0 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_order = $this->getOrder() ?>
<?php $_giftMessage; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
index 9aab4c59be6..e0c4105438e 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */
$_item = $this->getItem();
?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
index e2f81e8768a..79704c3c39c 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Order\View*/?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
index b7e54c73b68..2823699fa3d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="order-date"><?php echo __('<span class="label">Order Date:</span> %1', '<date>' . $this->formatDate($this->getOrder()->getCreatedAtStoreDate(), 'long') . '</date>') ?></div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
index 3c7dc88ec35..82d2f959548 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_order = $this->getOrder() ?>
<?php $_creditmemo = $this->getCreditmemo() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index 648f6faa76d..99ed950904d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_order = $this->getOrder() ?>
<?php $_invoice = $this->getInvoice() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
index 9b8f7209a1d..d3e98e975ee 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /* @var $this \Magento\Sales\Block\Order\PrintOrder\Shipment */ ?>
<?php $order = $this->getOrder(); ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
index 62a4384812e..86dc8de7bb0 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="block block-dashboard-orders">
<?php $_orders = $this->getOrders(); ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
index a545799b193..f9c5ff8daa8 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_item = $this->getItem() ?>
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml b/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
index 6fd0974e25b..4437fef157a 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Sales\Block\Order\Totals
* @see \Magento\Sales\Block\Order\Totals
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
index 5bb0838aa3f..4bb5b582a83 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Sales\Block\Order\View*/?>
<div class="order-details-items ordered">
diff --git a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
index 6ce21418899..64b11d21a6b 100644
--- a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
index d240974b7ee..7ccb75b8263 100644
--- a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Sales\Block\Widget\Guest\Form */
?>
<?php if ($this->isEnable()): ?>
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
index 7c299424dc6..8136a7e579b 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons;
/**
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
index 7f911a3ef4a..5e8daffc61b 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Main.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab;
use Magento\Backend\Block\Template\Context;
diff --git a/app/code/Magento/SalesRule/Helper/Coupon.php b/app/code/Magento/SalesRule/Helper/Coupon.php
index 958119bef18..4d5339fb414 100644
--- a/app/code/Magento/SalesRule/Helper/Coupon.php
+++ b/app/code/Magento/SalesRule/Helper/Coupon.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\SalesRule\Helper;
/**
diff --git a/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php b/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
index 38f92fde3a8..da9690947d5 100644
--- a/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
+++ b/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\SalesRule\Model\Resource\Report\Rule;
/**
diff --git a/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php b/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
index ba0fb345b26..c70156e782e 100644
--- a/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\SalesRule\Model\Resource\Rule;
/**
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index 4dc6fcd0ba1..4514edbe79e 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\SalesRule\Model;
use Magento\Sales\Model\Quote\Address;
diff --git a/app/code/Magento/Search/Model/Resource/Query.php b/app/code/Magento/Search/Model/Resource/Query.php
index f608fac3a1b..7b7a4c05d3d 100644
--- a/app/code/Magento/Search/Model/Resource/Query.php
+++ b/app/code/Magento/Search/Model/Resource/Query.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Search\Model\Resource;
use Magento\Framework\DB\Select;
diff --git a/app/code/Magento/Search/view/frontend/templates/search_data.phtml b/app/code/Magento/Search/view/frontend/templates/search_data.phtml
index 6c8680646d9..808611a0f82 100644
--- a/app/code/Magento/Search/view/frontend/templates/search_data.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/search_data.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Search/view/frontend/templates/term.phtml b/app/code/Magento/Search/view/frontend/templates/term.phtml
index 9e9977e7781..9bda4cfeddd 100644
--- a/app/code/Magento/Search/view/frontend/templates/term.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/term.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (sizeof($this->getTerms()) > 0): ?>
<ul class="search-terms">
diff --git a/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php b/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php
index 4cffba0bbcb..2376f8d2099 100644
--- a/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/Sendfriend/Controller/Product/Sendmail.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sendfriend\Controller\Product;
use Magento\Framework\Exception\NoSuchEntityException;
diff --git a/app/code/Magento/Sendfriend/Helper/Data.php b/app/code/Magento/Sendfriend/Helper/Data.php
index c667b891280..9d575ccc492 100644
--- a/app/code/Magento/Sendfriend/Helper/Data.php
+++ b/app/code/Magento/Sendfriend/Helper/Data.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sendfriend\Helper;
/**
diff --git a/app/code/Magento/Sendfriend/view/frontend/templates/send.phtml b/app/code/Magento/Sendfriend/view/frontend/templates/send.phtml
index b64bbf90280..dd1e7876143 100644
--- a/app/code/Magento/Sendfriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/Sendfriend/view/frontend/templates/send.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* Send to friend form
*
diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
index 670b6e7f7cf..50d5c70d237 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Popup.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Popup.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Shipping\Block\Tracking;
class Popup extends \Magento\Framework\View\Element\Template
diff --git a/app/code/Magento/Shipping/Helper/Data.php b/app/code/Magento/Shipping/Helper/Data.php
index 17309f09692..7d27a44e2e5 100644
--- a/app/code/Magento/Shipping/Helper/Data.php
+++ b/app/code/Magento/Shipping/Helper/Data.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Shipping data helper
*/
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index b1f367ae006..e6c651a302e 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Shipping\Model\Carrier;
use Magento\Sales\Model\Quote\Address\AbstractCarrierInterface;
diff --git a/app/code/Magento/Shipping/Model/Config.php b/app/code/Magento/Shipping/Model/Config.php
index 4f82211ccac..25a2430b514 100644
--- a/app/code/Magento/Shipping/Model/Config.php
+++ b/app/code/Magento/Shipping/Model/Config.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Shipping\Model;
class Config extends \Magento\Framework\Object
diff --git a/app/code/Magento/Shipping/Model/Info.php b/app/code/Magento/Shipping/Model/Info.php
index f718ab0277e..df370cd303f 100644
--- a/app/code/Magento/Shipping/Model/Info.php
+++ b/app/code/Magento/Shipping/Model/Info.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Shipping\Model;
use Magento\Sales\Model\Order\Shipment;
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index 4ea4dccda13..898715c3f2f 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Shipping\Model\Shipping;
use Magento\Sales\Model\Order\Shipment;
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
index bf74e67e85c..ce1a8f6da9c 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<form id="edit_form" method="post" action="<?php echo $this->getSaveUrl() ?>">
<?php echo $this->getBlockHtml('formkey')?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
index a5d7c4ece05..81e8a5d9743 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="fieldset-wrapper">
<div class="fieldset-wrapper-title">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
index bed8376665a..0ebab3550bd 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_item = $this->getItem() ?>
<tr>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/Tracking/view.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/Tracking/view.phtml
index 4dabbaf9a59..3a27498d4a4 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/Tracking/view.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/Tracking/view.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this Magento\Shipping\Block\Adminhtml\Order\Tracking\View */ ?>
<table cellspacing="0" class="data-table" id="shipment_tracking_info">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index cda9ee0705a..63dbe0c0e65 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="grid">
<table cellspacing="0" class="data-table">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
index 93f8b2b34fa..683bd63f31f 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div id="popup-window-mask" style="display:none;"></div>
<div id="packed_window" style="display:none;" class="packed-window">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
index 270a0dacd17..79c038eebb4 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Shipping\Block\Adminhtml\Order\Packaging */ ?>
<?php
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
index 1a5298c2d28..cde0f859c86 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this Magento\Shipping\Block\Adminhtml\Order\Tracking */?>
<script type="text/javascript">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
index 80e89197c69..6a1df536752 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Shipping\Block\Adminhtml\View */ ?>
<?php $order = $this->getOrder() ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
index fd35a00fef0..03ac2d49108 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_order = $this->getShipment()->getOrder() ?>
<?php echo $this->getChildHtml('order_info') ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
index d80c031bc20..1795c067208 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="grid">
<table cellspacing="0" class="data">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
index e9d14683585..7bb7483c65f 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php $_item = $this->getItem() ?>
<tr class="border">
diff --git a/app/code/Magento/Shipping/view/frontend/templates/items.phtml b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
index 7b1d6465dad..1376e2b38b0 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/items.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Shipping\Block\Items */ ?>
<?php $_order = $this->getOrder() ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
index 8d2a368bb83..7fb288cf39f 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Shipping\Block\Tracking\Link */ ?>
<?php $order = $this->getOrder() ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
index d9f69a82b08..c0ebf8bffe0 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Shipping\Block\Tracking\Popup */ ?>
<?php $_results = $this->getTrackingInfo(); ?>
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index be8003120f4..b1612183a93 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sitemap\Model;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/app/code/Magento/Store/Model/Resource/Website.php b/app/code/Magento/Store/Model/Resource/Website.php
index 548a8083aca..448edec74c0 100644
--- a/app/code/Magento/Store/Model/Resource/Website.php
+++ b/app/code/Magento/Store/Model/Resource/Website.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Store\Model\Resource;
/**
diff --git a/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml b/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
index 48096cdd58d..e097cddf11d 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if (count($this->getStores())>1): ?>
<div class="form-language">
diff --git a/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml b/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
index d1d7d491ff0..0e78be04411 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml b/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
index 3d2fd8e2da4..42351714c38 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 1b772520e42..ba9569bf869 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Admin product tax class add form
*
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index c1f82df0eae..6432eb45335 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Helper;
use Magento\Framework\Pricing\PriceCurrencyInterface;
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate.php b/app/code/Magento/Tax/Model/Calculation/Rate.php
index 69f0dba1804..bdec4205b13 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Model\Calculation;
use Magento\Directory\Model\Region;
diff --git a/app/code/Magento/Tax/Model/Observer.php b/app/code/Magento/Tax/Model/Observer.php
index ec9589dff5c..47d1cde738f 100644
--- a/app/code/Magento/Tax/Model/Observer.php
+++ b/app/code/Magento/Tax/Model/Observer.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Tax Event Observer
*/
diff --git a/app/code/Magento/Tax/Model/Resource/Sales/Order/Tax/Item.php b/app/code/Magento/Tax/Model/Resource/Sales/Order/Tax/Item.php
index fb839507c2e..74c983b9900 100644
--- a/app/code/Magento/Tax/Model/Resource/Sales/Order/Tax/Item.php
+++ b/app/code/Magento/Tax/Model/Resource/Sales/Order/Tax/Item.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Sales order tax resource model
*
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index f575b6bb03c..71c0bdabda5 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Model\Sales\Total\Quote;
use Magento\Customer\Api\Data\AddressDataBuilder as CustomerAddressBuilder;
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
index 0f301d33b21..d8cda36b215 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $this */
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
index d079c32a759..79fdfa9f687 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $this */
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
index 2fe5025ef94..5ec16e360ee 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $this */
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
index 624ba4526e2..8f3c9ef80ab 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $this */
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
index 734c136f61b..ddbe2a3fd7e 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $this */
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
index ad283eea65b..4159ac07676 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $this */
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
index 2685d059ee4..641305d142f 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="entry-edit">
<?php echo $this->getFormHtml() ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
index d0237f14711..f0b1ab2acb2 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
require([
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
index 281fe9331e5..38819c3eab8 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div id="tax-rate-titles-table" class="form-inline">
<?php $_labels = $this->getTitles() ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
index 2d28250e695..a71a12c7202 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="page-actions">
<?php echo $this->getBackButtonHtml() ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
index ceed44961a2..15eb9d51b40 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildhtml('grid') ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
index 9c6113d0da0..421cd3b3239 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($form): ?>
<?php echo $form->toHtml();?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
index ead9b0b414b..b5907ad2ee5 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="page-actions">
<?php echo $this->getBackButtonHtml(); ?>
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
index 2fd76b7cd61..c01e095fe15 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var \Magento\Tax\Pricing\Render\Adjustment $this */ ?>
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
index 15aed83feb8..e972bd5651a 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var \Magento\Tax\Pricing\Render\Adjustment $this */ ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index b930750abc9..5f88389446c 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Tax\Block\Item\Price\Renderer */
?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/minicart/totals.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/minicart/totals.phtml
index 946521249ec..df95da06201 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/minicart/totals.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/minicart/totals.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this Magento\Tax\Block\Checkout\Cart\Sidebar\Totals */
?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index 7ab38d71ab1..cd11d781466 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Tax\Block\Checkout\Grandtotal
*/
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index f8b87ef4a10..22673c575cd 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Tax\Block\Checkout\Shipping
* @see \Magento\Tax\Block\Checkout\Shipping
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
index 3ad02aae527..3d50543b0fc 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php /** @var $this \Magento\Tax\Block\Checkout\Shipping\Price */ ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index 829df718b86..2dd61d500e9 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Tax\Block\Checkout\Subtotal
* @see \Magento\Tax\Block\Checkout\Subtotal
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 68d4b3f2ff9..ae22b56b776 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Tax\Block\Checkout\Tax
* @see \Magento\Tax\Block\Checkout\Tax
diff --git a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
index ec1a29b7a72..4ebcb9c378c 100644
--- a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Tax\Block\Item\Price\Renderer $this */
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
index 2e76a49591e..234fcea3bf4 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Tax\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
index e69611624e7..2f2fbddda1d 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Tax\Block\Item\Price\Renderer $this */
$_item = $this->getItem();
?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
index aabf553634e..9fc07d92073 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Tax\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index 8daf282fea4..e2ee082bde6 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
$_order = $this->getOrder();
diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
index f79729b10da..a13d84f23d4 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="import-export-tax-rates">
<?php if (!$this->getIsReadonly()): ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
index e46e59f10af..e1fbb788614 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Theme/view/base/templates/root.phtml b/app/code/Magento/Theme/view/base/templates/root.phtml
index 481476a5e03..5bc71b96745 100644
--- a/app/code/Magento/Theme/view/base/templates/root.phtml
+++ b/app/code/Magento/Theme/view/base/templates/root.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<!doctype html>
<html <?php echo $htmlAttributes ?>>
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
index 45a357610b3..b0bf824f988 100644
--- a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="block block-banner">
<div class="block-content">
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
index 45a357610b3..b0bf824f988 100644
--- a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="block block-banner">
<div class="block-content">
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
index e86e664b36b..92d60c6d1fd 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="block <?php echo $this->getBlockCss(); ?>">
<div class="block-title <?php echo $this->getBlockCss(); ?>-title"><strong><?php echo $this->getBlockTitle(); ?></strong></div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
index 30d91506c29..1ecabb513bd 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($crumbs && is_array($crumbs)) : ?>
<div class="breadcrumbs">
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
index ad4aac8bc79..ab8fd4c9075 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="block <?php echo $this->getBlockCss(); ?>">
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
index 4699d3b7704..2e31dbdbb21 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml(); ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
index 267fcc72588..047c46e45c2 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="footer-container">
<div class="footer">
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
index 1648be0c0db..157be693875 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var \Magento\Theme\Block\Html\Header $this
*/
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
index 5f0e686d547..da9a26af1fc 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var \Magento\Theme\Block\Html\Header\Logo $this
*/
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
index 35d3676c265..5b4fbf797ae 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
index ebe4d17aa28..589624562aa 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
index 8bd11572cba..16216e23cdd 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
index 6a79fa0907a..1193780c555 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
$target_id = $this->getTargetId();
?>
<a id="<?php echo $target_id?>" name="<?php echo $target_id?>" tabindex="0"></a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
index b61e594fa18..5abf4b62b1e 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Theme\Block\Html\Title
*/
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 10a6fd1622d..84fe61d1961 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/components.phtml b/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/link.phtml b/app/code/Magento/Theme/view/frontend/templates/link.phtml
index 35f23c92ccd..31fc2b41d81 100644
--- a/app/code/Magento/Theme/view/frontend/templates/link.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/link.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Framework\View\Element\Html\Link
*/
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index db333e01f16..5f0263b09e2 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Translation\Model\Js;
class DataProvider implements DataProviderInterface
diff --git a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
index 2cf7a616767..cba382fffdc 100644
--- a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
diff --git a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
index 43dff0209fc..016e2c49f2b 100644
--- a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Form/Fieldset.php b/app/code/Magento/Ui/Controller/Adminhtml/Form/Fieldset.php
index cb2f2d6e2f2..13588324672 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Form/Fieldset.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Form/Fieldset.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Ui\Controller\Adminhtml\Form;
/**
diff --git a/app/code/Magento/Ui/DataProvider/Config/Converter.php b/app/code/Magento/Ui/DataProvider/Config/Converter.php
index 7a3d8c2a29f..0791d17f06c 100644
--- a/app/code/Magento/Ui/DataProvider/Config/Converter.php
+++ b/app/code/Magento/Ui/DataProvider/Config/Converter.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Ui\DataProvider\Config;
use Magento\Framework\Config\ConverterInterface;
diff --git a/app/code/Magento/Ui/view/base/templates/control/button/default.phtml b/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
index 7e1c36d645c..6846378433b 100644
--- a/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/**
diff --git a/app/code/Magento/Ui/view/base/templates/filter_pool/active.phtml b/app/code/Magento/Ui/view/base/templates/filter_pool/active.phtml
index 09384d47f2f..da0679d3282 100644
--- a/app/code/Magento/Ui/view/base/templates/filter_pool/active.phtml
+++ b/app/code/Magento/Ui/view/base/templates/filter_pool/active.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var \Magento\Ui\Component\Filter $this
*/
diff --git a/app/code/Magento/Ui/view/base/templates/form/fieldset/default.phtml b/app/code/Magento/Ui/view/base/templates/form/fieldset/default.phtml
index 4a6d9131c18..86d60f9638e 100644
--- a/app/code/Magento/Ui/view/base/templates/form/fieldset/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/form/fieldset/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var \Magento\Ui\Component\Form\Fieldset $this
*/
diff --git a/app/code/Magento/Ui/view/base/templates/layout/group/default.phtml b/app/code/Magento/Ui/view/base/templates/layout/group/default.phtml
index 76ad70c6fee..d84bc43894d 100644
--- a/app/code/Magento/Ui/view/base/templates/layout/group/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/layout/group/default.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var \Magento\Ui\Component\Layout\Group $this
*/
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 460bf55511c..d7feaf5c2cb 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Ups\Model;
use Magento\Sales\Model\Quote\Address\RateRequest;
diff --git a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
index c7b4f5c18dc..191d55b13ad 100644
--- a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
+++ b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $upsModel \Magento\Ups\Helper\Config */
/** @var $this \Magento\Ups\Block\Backend\System\CarrierConfig */
$upsCarrierConfig = $this->getCarrierConfig();
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
index 8542333da72..ac187b9594c 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\UrlRewrite\Block\Catalog\Category\Tree */
?>
<fieldset class="fieldset" data-ui-id="category-selector">
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
index 0f2a5ddafa9..bbf5b0f6acc 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\UrlRewrite\Block\Edit
*/
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
index 35f5655cbbc..52e3e82fcae 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\UrlRewrite\Block\Selector */
?>
<div class="form-inline">
diff --git a/app/code/Magento/User/Block/User/Edit/Tab/Main.php b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
index 6ca4d9cac52..89e9630f550 100644
--- a/app/code/Magento/User/Block/User/Edit/Tab/Main.php
+++ b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\User\Block\User\Edit\Tab;
/**
diff --git a/app/code/Magento/User/Model/Resource/User.php b/app/code/Magento/User/Model/Resource/User.php
index c27a049e6ee..7d5481635e8 100644
--- a/app/code/Magento/User/Model/Resource/User.php
+++ b/app/code/Magento/User/Model/Resource/User.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\User\Model\Resource;
use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
index b25246cdd46..9af7eed661a 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<!doctype html>
<html lang="en">
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
index 676830a8f63..ef6a32d25b5 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="links">
<a class="action-forgotpassword" href="<?php echo $this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])?>"><?php echo __('Forgot your password?') ?></a>
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
index 3b9a9403052..5d2e0a9d26d 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html lang="en">
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
index ba0ee818fa6..ef92304ae22 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
index 83dc6b1943c..39d6852091a 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
require([
diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
index b94106dcd12..f3838f446df 100644
--- a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<script type="text/javascript">
require([
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 3d7afd722b9..8fa9ee89476 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Usps\Model;
use Magento\Shipping\Helper\Carrier as CarrierHelper;
diff --git a/app/code/Magento/Usps/Model/Source/Method.php b/app/code/Magento/Usps/Model/Source/Method.php
index 33f8a195eff..ee910bddbfa 100644
--- a/app/code/Magento/Usps/Model/Source/Method.php
+++ b/app/code/Magento/Usps/Model/Source/Method.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Usps\Model\Source;
/**
diff --git a/app/code/Magento/Webapi/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml b/app/code/Magento/Webapi/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
index 76d3c48ef3f..34eb8c157d3 100644
--- a/app/code/Magento/Webapi/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
+++ b/app/code/Magento/Webapi/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
@@ -6,6 +6,9 @@
*
* @var \Magento\Webapi\Block\Adminhtml\Integration\Activate\Permissions\Tab\Webapi $this
*/
+
+// @codingStandardsIgnoreFile
+
?>
<fieldset class="fieldset form-inline entry-edit">
<?php if ($this->isTreeEmpty()): ?>
diff --git a/app/code/Magento/Webapi/view/adminhtml/templates/resourcetree.phtml b/app/code/Magento/Webapi/view/adminhtml/templates/resourcetree.phtml
index 1893fddb85a..59dcf8c2d90 100644
--- a/app/code/Magento/Webapi/view/adminhtml/templates/resourcetree.phtml
+++ b/app/code/Magento/Webapi/view/adminhtml/templates/resourcetree.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
index 6b2559a89f4..1a173068d05 100644
--- a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Weee\Block\Renderer\Weee;
use Magento\Framework\Data\Form\Element\AbstractElement;
diff --git a/app/code/Magento/Weee/Model/Total/Quote/Weee.php b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
index 2c51cd9b25d..b806a1f7939 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Weee\Model\Total\Quote;
use Magento\Framework\Pricing\PriceCurrencyInterface;
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
index cb217711f95..d2df4da6cb0 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $this */
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
index 05007acd55a..6a522a55135 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $this */
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
index e19dbc5fa1a..2b36dd996c6 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $this */
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
index a760ff6692f..3adcabf701b 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var $this \Magento\Weee\Block\Item\Price\Renderer */
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
index 13b1e2abcbb..a3fd6503b2e 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Weee\Block\Item\Price\Renderer $this */
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
index 1026f33572d..c6735267c10 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Weee\Block\Item\Price\Renderer $this */
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
index 6dbbb324363..98bcb5c61aa 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var $this \Magento\Weee\Block\Renderer\Weee\Tax */
diff --git a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
index ba8d7c13836..4cc2e4d1148 100644
--- a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 627b34dcb62..1c9a420c244 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Weee\Block\Item\Price\Renderer */
?>
<?php $_item = $this->getItem() ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index d70e069496b..870946394a3 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Weee\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index cb7ebc067e0..42f9a6107bc 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Weee\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index dc8a8ede6e8..fea2b69caa6 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Weee\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index 81623a5d2e1..4d4d16aa982 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Weee\Block\Item\Price\Renderer */
$_item = $this->getItem();
diff --git a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
index 7c5040932f4..d62f36df8b8 100644
--- a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Weee\Block\Item\Price\Renderer $this */
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index be55f2e342e..4feacf64289 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Weee\Block\Item\Price\Renderer */
$item = $this->getItem();
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
index b664e81b131..e38036411f9 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var \Magento\Weee\Block\Item\Price\Renderer $this */
$_item = $this->getItem();
?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 4c949754ddf..909642497e3 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Weee\Block\Item\Price\Renderer */
$item = $this->getItem();
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
index bc397bb6c1e..71664c22cf9 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* WYSIWYG widget plugin main block
*
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 2c1848c89a6..f7f5750ad48 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main;
use Magento\Framework\Data\Form\Element\AbstractElement;
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index df0679c6def..1cee5293c37 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Widget model for different purposes
*
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 7d616b11baa..389740ad484 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<fieldset class="fieldset">
<legend class="legend"><span><?php echo __('Layout Updates') ?></span></legend>
diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php
index cc3f2edf3a3..dc4b102b16e 100644
--- a/app/code/Magento/Wishlist/Model/Item.php
+++ b/app/code/Magento/Wishlist/Model/Item.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Wishlist\Model;
use Magento\Catalog\Api\ProductRepositoryInterface;
diff --git a/app/code/Magento/Wishlist/sql/wishlist_setup/install-2.0.0.php b/app/code/Magento/Wishlist/sql/wishlist_setup/install-2.0.0.php
index 421dbbc9046..9a3da3b5bfb 100644
--- a/app/code/Magento/Wishlist/sql/wishlist_setup/install-2.0.0.php
+++ b/app/code/Magento/Wishlist/sql/wishlist_setup/install-2.0.0.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var $installer \Magento\Setup\Module\SetupModule */
$installer = $this;
diff --git a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
index b7c3458d9de..3e8c26d5c6a 100644
--- a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
+++ b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @var $this \Magento\Framework\View\Element\Template
*/
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml
index 6ff6cd8eb40..ac6d8e1e250 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Wishlist\Block\Customer\Wishlist\Button */
?>
<?php if ($this->getWishlist()->getItemsCount() && $this->getWishlist()->getShared() < $this->getConfig()->getSharingEmailLimit()): ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
index c7b5f99310e..814924c39ab 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getWishlist()->getItemsCount() && $this->getWishlist()->isSalable()): ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
index 59608264124..34cd7dc6456 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php if ($this->getWishlist()->getItemsCount()): ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml b/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
index f9e858a77ea..d44fdb83b9f 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Wishlist\Block\Share\Email\Items */
?>
<?php $l = $this->getWishlistItemsCount() ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
index dbdbff44a1f..99b1caa1e0c 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var \Magento\Wishlist\Model\Item $item */
?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
index 96866177392..a32dbe9f24b 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart */
/* @var \Magento\Wishlist\Model\Item $item */
$item = $this->getItem();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
index b9fbb3abdab..d1320c06137 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var \Magento\Wishlist\Model\Item $item */
$item = $this->getItem();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
index 8ebb3112383..d0c4e977b03 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var \Magento\Wishlist\Model\Item $item */
$item = $this->getItem();
$product = $item->getProduct();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
index 2aa5e3f2bf9..8af920fa493 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var \Magento\Wishlist\Model\Item $item */
$item = $this->getItem();
$product = $item->getProduct();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
index fb18ae64155..e10c4f68270 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var \Magento\Wishlist\Model\Item $item */
$item = $this->getItem();
$product = $item->getProduct();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
index 5cae1894aa8..967f2c542c0 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/* @var \Magento\Wishlist\Model\Item $item */
?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
index 34f9ad64ffb..cd1db8ad0b6 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<a href="#" data-role="remove" data-post-remove='<?php echo $this->getItemRemoveParams($this->getItem()); ?>' title="<?php echo __('Remove Item') ?>" class="btn-remove action delete">
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
index 824105a48ab..34de05f4690 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<div class="product-addto-links" data-role="add-to-links">
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
index 90c4ac35665..61bd8197877 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php
/** @var \Magento\Wishlist\Block\Customer\Wishlist\Items $this */
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml b/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
index 5c84082b62f..e5fab539878 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
@@ -2,5 +2,8 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<?php echo $this->getChildHtml() ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
index f065020ba8e..ec4c6377e37 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Wishlist\Block\Link */
?>
<li class="link wishlist">
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
index 174bd04011b..5f6e9c6d427 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Wishlist\Block\Customer\Wishlist\Item\Options */
?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml b/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
index 8199de3bc66..7eafde04c26 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Wishlist\Block\Rss\EmailLink */
?>
<?php if ($this->getLink()): ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml
index bf85e444ab0..903123301b0 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Wishlist\Block\Rss\Link */
?>
<?php if ($this->isRssAllowed() && $this->getLink() && $this->helper('Magento\Wishlist\Helper\Data')->getWishlist()->getItemsCount()): ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
index 0e2b0de7ea9..48421dbc74b 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Wishlist\Block\Share\Wishlist */
$imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
index 249a56682c1..eb6bc6ced93 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/** @var $this \Magento\Wishlist\Block\Customer\Sharing */
?>
<form class="form wishlist share"
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index 38b4f5cd12b..647e2159fb1 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Wishlist\Block\Customer\Sidebar */
?>
<?php
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
index 8ee612a7637..0fcc0b4fa60 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
/* @var $this \Magento\Wishlist\Block\Customer\Wishlist */
?>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/DataObjectServiceInterface.php b/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/DataObjectServiceInterface.php
index f189b2c9ef4..4bfee64dbb6 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/DataObjectServiceInterface.php
+++ b/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/DataObjectServiceInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\TestModule4\Service\V1;
use Magento\TestModule4\Service\V1\Entity\DataObjectRequest;
diff --git a/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/Entity/ExtensibleRequest.php b/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/Entity/ExtensibleRequest.php
index 41f78a2ed61..219d530cbe9 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/Entity/ExtensibleRequest.php
+++ b/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/Entity/ExtensibleRequest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\TestModule4\Service\V1\Entity;
class ExtensibleRequest extends \Magento\Framework\Model\AbstractExtensibleModel
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeDataObject.php b/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeDataObject.php
index dc3a1c1a17e..ae2774402b5 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeDataObject.php
+++ b/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeDataObject.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\TestModuleMSC\Model\Data;
use Magento\TestModuleMSC\Api\Data\CustomAttributeDataObjectInterface;
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeNestedDataObject.php b/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeNestedDataObject.php
index 9ea73d87ace..2df0fb0ccd0 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeNestedDataObject.php
+++ b/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/CustomAttributeNestedDataObject.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\TestModuleMSC\Model\Data;
use Magento\TestModuleMSC\Api\Data\CustomAttributeNestedDataObjectInterface;
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/Item.php b/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/Item.php
index 5593ffcffb4..664e428b484 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/Item.php
+++ b/dev/tests/api-functional/_files/Magento/TestModuleMSC/Model/Data/Item.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\TestModuleMSC\Model\Data;
use Magento\TestModuleMSC\Api\Data\ItemInterface;
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
index 6bc41d3a3f4..9d8ee24e5a8 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
@@ -8,6 +8,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\TestFramework\Annotation;
class ApiDataFixture
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
index eaa58bae0e5..ed13f1d45a0 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Api;
use Magento\TestFramework\TestCase\WebapiAbstract;
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php
index 14f8614829e..73236d2741c 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Api;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
index 1995c194bd5..a40da8c2af5 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Api;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductMediaAttributeManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductMediaAttributeManagementTest.php
index 8939bf5c362..787b7c03f0d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductMediaAttributeManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductMediaAttributeManagementTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Api;
use Magento\TestFramework\TestCase\WebapiAbstract;
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
index 04f3d9c3d44..e41327ad016 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductTierPriceManagementTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Api;
use Magento\TestFramework\TestCase\WebapiAbstract;
diff --git a/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockItemTest.php b/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockItemTest.php
index bab5b01aa08..5b443ce8a61 100644
--- a/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockItemTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockItemTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogInventory\Api;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
index 01f3bd7a1bd..08caeab1247 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ConfigurableProduct\Api;
use Magento\Webapi\Model\Rest\Config;
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
index 5bc344be717..35b651ae893 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Api;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Service/V1/DownloadableLink/WriteServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Service/V1/DownloadableLink/WriteServiceTest.php
index 6f96f195175..80c36ec1a0d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Service/V1/DownloadableLink/WriteServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Service/V1/DownloadableLink/WriteServiceTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Service\V1\DownloadableLink;
use Magento\Catalog\Model\Product;
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Service/V1/DownloadableSample/WriteServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Service/V1/DownloadableSample/WriteServiceTest.php
index 542e1527f8e..450cca45c1e 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Service/V1/DownloadableSample/WriteServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Service/V1/DownloadableSample/WriteServiceTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Downloadable\Service\V1\DownloadableSample;
use Magento\Catalog\Model\Product;
diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Service/V1/WriteServiceTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Service/V1/WriteServiceTest.php
index 79185a68dca..0d5b133bc29 100644
--- a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Service/V1/WriteServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Service/V1/WriteServiceTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\GiftMessage\Service\V1;
use Magento\TestFramework\TestCase\WebapiAbstract;
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
index e7fb134e9d2..a583c45e80b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCreateTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Service\V1;
use Magento\TestFramework\TestCase\WebapiAbstract;
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
index c9a46103a9c..4673d76dc98 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Service\V1;
use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
index b73cd43ee82..d484246e16f 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Service\V1;
use Magento\TestFramework\TestCase\WebapiAbstract;
diff --git a/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxClassRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxClassRepositoryTest.php
index 4a462cbc3fb..829888c3443 100644
--- a/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxClassRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxClassRepositoryTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Api;
use Magento\Framework\Api\FilterBuilder;
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
index 3f27b6179ec..06beecd1b99 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Webapi;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php b/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
index dbbc6e449db..c224c313ea1 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* See \Magento\TestFramework\Db\Adapter\TransactionInterface
*/
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
index b20d22b4382..5ccb0771d18 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* MySQL platform database handler
*/
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
index 2deb8c176ed..7cde467f0ec 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Grid;
use Magento\Framework\App\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/NewActionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/NewActionTest.php
index 02b82f8996f..b984e413763 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/NewActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/NewActionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Controller\Adminhtml\Product;
/**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
index 9f0003eab39..ea5a6402354 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Controller\Product;
/**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php
index 38a3237e65f..39d23e20bc3 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product;
/**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/OptionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/OptionTest.php
index c0b5b823179..44ce3a9c953 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/OptionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Resource/Product/OptionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Resource\Product;
class OptionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 2e46af3a1d2..25a5b3982b2 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\CatalogImportExport\Model\Import\Product
*
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php
index d3d95928265..bbb408931f9 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogInventory\Block\Adminhtml\Form\Field;
class CustomergroupTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php
index 10a89ad5793..25507d7f2c2 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/CategoryTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogSearch\Model\Layer\Filter;
/**
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
index 315a9832467..0c44b81bdec 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogUrlRewrite\Model;
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved.php
index ef770525c80..629282c5804 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
require 'simple_product.php';
/** @var \Magento\Sales\Model\Quote $quote */
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php
index b9627f05dd8..05449837b0c 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
require __DIR__ . '/../../Customer/_files/customer.php';
require __DIR__ . '/../../Customer/_files/customer_address.php';
require __DIR__ . '/../../../Magento/Catalog/_files/product_virtual.php';
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
index a7cb4bc3a3b..539e93800a6 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Cms\Controller;
class RouterTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/ConfigTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/ConfigTest.php
index f9450efff01..c815e317821 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/ConfigTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Super;
use Magento\Catalog\Model\Resource\Eav\Attribute;
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
index 32e13662012..69660d121c2 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ConfigurableProduct\Model\Product\Type;
/**
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php
index 7624cba1b93..6e1b0c0c255 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Variable;
/**
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
old mode 100755
new mode 100644
index 278aec01be9..1dbed91a74b
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Controller;
use Magento\Framework\Message\MessageInterface;
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AjaxLoginTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AjaxLoginTest.php
old mode 100755
new mode 100644
index 14f4f633f27..116b41cb489
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AjaxLoginTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AjaxLoginTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Controller;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
index 9bbb4abb87f..4ebc493d441 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model;
use Magento\Framework\Exception\NoSuchEntityException;
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_non_default_website_id.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_non_default_website_id.php
index 0625ddcc040..5748a9531d7 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_non_default_website_id.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_non_default_website_id.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* @var \Magento\Store\Model\Website $website
*/
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
index 63c1f682bad..b8f8c57adac 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CustomerImportExport\Model\Export;
use Magento\CustomerImportExport\Model\Import\Address as ImportAddress;
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
index f699d5ff253..e16a75a6fca 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CustomerImportExport\Model\Import;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
index 05dbbb15f82..58cdb85ce7e 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Directory\Model;
use Magento\Framework\ObjectManagerInterface;
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php
index d925eda75bb..72ed334d97b 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
$billingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Sales\Model\Order\Address',
[
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
index ab85665a851..0dab21964dd 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test for an PDO MySQL adapter
*/
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
index d005d25826a..528f8087003 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Fixture;
class Intercepted extends InterceptedParent implements InterceptedInterface
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedInterface.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedInterface.php
index 7a951369e38..fd107192031 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedInterface.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedInterface.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Fixture;
interface InterceptedInterface
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParent.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParent.php
index 72ec8842a52..cdcb8fb8276 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParent.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParent.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Fixture;
class InterceptedParent implements InterceptedParentInterface
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParentInterface.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParentInterface.php
index 263e6d7bab5..9111ee6d8e0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParentInterface.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/InterceptedParentInterface.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Fixture;
interface InterceptedParentInterface
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Less/File/Collector/AggregatedTest.php b/dev/tests/integration/testsuite/Magento/Framework/Less/File/Collector/AggregatedTest.php
index 0ff52725cb4..9868303c464 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Less/File/Collector/AggregatedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Less/File/Collector/AggregatedTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Less\File\Collector;
use Magento\Framework\App\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/AbstractTest.php
index f6f95d32bb6..a85db471a15 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Model/Resource/Db/AbstractTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Model\Resource\Db;
class AbstractTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
index 4c15da838ad..63a84511452 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Stdlib\Cookie;
use Magento\Framework\ObjectManagerInterface;
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieReaderTest.php
index 2185d74ad3a..fa22fd44751 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieReaderTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Stdlib\Cookie;
use Magento\Framework\Stdlib\Cookie\PhpCookieReader;
@@ -51,4 +53,4 @@ class PhpCookieReaderTest extends \PHPUnit_Framework_TestCase
{
$_COOKIE = $this->preTestCookies;
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
index 4eaa8dfe815..f2112082396 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test for abstract export model
*/
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
index ba1ea5ac55f..c59967f56e3 100644
--- a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Block\Checkout\Address;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php
index f4518206185..dbb9639f9d0 100644
--- a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Block\Checkout;
/**
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php
index 73416a46d5e..d385563f7c8 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Controller\Adminhtml\Report\Product;
/**
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php b/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
index 313c605ee8a..11e04a1560a 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\App\AreaList')
->getArea('adminhtml')
->load(\Magento\Framework\App\Area::PART_CONFIG);
diff --git a/dev/tests/integration/testsuite/Magento/Review/Block/Adminhtml/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/Review/Block/Adminhtml/Edit/FormTest.php
index 0c5398262b1..bdabd72aa06 100644
--- a/dev/tests/integration/testsuite/Magento/Review/Block/Adminhtml/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Review/Block/Adminhtml/Edit/FormTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Review\Block\Adminhtml\Edit;
class FormTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Review/Block/FormTest.php b/dev/tests/integration/testsuite/Magento/Review/Block/FormTest.php
index 0641d4cb384..31bfc21a04e 100644
--- a/dev/tests/integration/testsuite/Magento/Review/Block/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Review/Block/FormTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Review\Block;
class FormTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
index 753a7c1d614..abd91473c39 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Resource\Order;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index 72f9d33a5dc..4ff04ed35d4 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
require 'default_rollback.php';
require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
/** @var \Magento\Catalog\Model\Product $product */
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
index 3e39ac4c321..e9e4b7b54be 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
require __DIR__ . '/../../../Magento/Core/_files/store.php';
require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_duplicated.php';
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index 73c61a5af10..f9df463d1ba 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Store\Model;
use Magento\Framework\App\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
index ac9e5a14168..8adffbf713a 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Model\Sales\Total\Quote;
use Magento\Tax\Model\Config;
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php
index 6f24cee6597..93e4071ff7f 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Model\Sales\Total\Quote;
use Magento\Tax\Model\ClassModel;
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Pricing/AdjustmentTest.php b/dev/tests/integration/testsuite/Magento/Tax/Pricing/AdjustmentTest.php
index 02abbe0801f..bdc1f25f0b1 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Pricing/AdjustmentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Pricing/AdjustmentTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Pricing;
class AdjustmentTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
index 040c88dfe67..b2a3d9b1200 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Test\Integrity;
class LayoutTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
index 42ce74dccc7..312414f4019 100644
--- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\User\Controller\Adminhtml\User;
use Magento\Framework\Message\MessageInterface;
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
index aa5c6886e45..fa43d4b61b0 100644
--- a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\User\Model;
/**
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 0965b51e8d6..10eac1836f0 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Widget\Model\Config;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Helper/RssTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Helper/RssTest.php
index efa37b33401..c58b29a5b03 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Helper/RssTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Helper/RssTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Wishlist\Helper;
class RssTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php
index 487d0758338..ee20c1e1196 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\TestFramework\CodingStandard\Tool;
interface BlacklistInterface
@@ -15,4 +17,4 @@ interface BlacklistInterface
* @return void
*/
public function setBlackList(array $blackList);
-}
\ No newline at end of file
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php
index 66a60989ba2..9b36e1cfe47 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CopyPasteDetector.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* PHP Copy Paste Detector v1.4.0 tool wrapper
*/
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
index a3087c320e5..6a5c9e2af59 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
@@ -6,6 +6,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
return [
'/config/global/fieldsets' => '',
'/config/global/cache/betatypes' => '',
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 97baa914473..76e6bcb7d11 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
@@ -6,6 +6,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
return [
['ADMIN_STORE_ID', 'Magento\Framework\AppInterface'],
['BACKORDERS_BELOW'],
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 fa7d5001d20..cc675f9462e 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
@@ -4,6 +4,9 @@
* Format: array(<method_name = ''>[, <class_scope> = ''[, <replacement>[, <is_deprecated>]]])
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
return [
['__get', 'Magento\Framework\Object'],
['__set', 'Magento\Framework\Object'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
index 9edcd2c881a..2cb95cdc147 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -6,6 +6,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
return [
['_addresses', 'Magento\Customer\Model\Customer'],
['_addMinimalPrice', 'Magento\Catalog\Model\Resource\Product\Collection'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/classes/normal_class.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/classes/normal_class.php
index fe93af54335..657908ba822 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/classes/normal_class.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/classes/normal_class.php
@@ -3,6 +3,8 @@
* Doc block for this file
*/
+// @codingStandardsIgnoreFile
+
/**
* Doc block for this class
* @SuppressWarnings(PHPMD.UnusedPrivateField)
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/method_without_scope.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/method_without_scope.php
index 146fae12ef8..368e768525f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/method_without_scope.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/method_without_scope.php
@@ -3,6 +3,8 @@
* Doc block for this file
*/
+// @codingStandardsIgnoreFile
+
/**
* Doc block for this class
*/
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/multiline_wrong_declaration.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/multiline_wrong_declaration.php
index 7a09f309800..f70fe08470a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/multiline_wrong_declaration.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/multiline_wrong_declaration.php
@@ -10,6 +10,9 @@
* @return string
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
+
+// @codingStandardsIgnoreFile
+
function thereGoesFunc($someLongParam, $anotherLongParam, $moreEvenLongerParamForAllThatRoutineStuff,
$andThereGoesOneParameter
) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/normal_func.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/normal_func.php
index c2567f2fbe9..72c8cc4ad1c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/normal_func.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/normal_func.php
@@ -6,6 +6,9 @@
* @param string|null $inParam
* @return string
*/
+
+// @codingStandardsIgnoreFile
+
function someFunc($inParam)
{
if ($inParam === null) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/unneeded_multiline.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/unneeded_multiline.php
index e4d2fe3639e..b5f9052441e 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/unneeded_multiline.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/functions/unneeded_multiline.php
@@ -8,6 +8,9 @@
* @return string
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
+
+// @codingStandardsIgnoreFile
+
function thereGoesFunc($a,
$b
) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/inline_doc/format/wrong_align.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/inline_doc/format/wrong_align.php
index 312abd2e855..1c80b5708e9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/inline_doc/format/wrong_align.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/inline_doc/format/wrong_align.php
@@ -8,6 +8,9 @@
* @copyright ...
* @license ...
*/
+
+// @codingStandardsIgnoreFile
+
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_coding_style_inline_doc_format_wrong_align
{
/**
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/inline_doc/normal.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/inline_doc/normal.php
index de702f43d38..15c44b8e078 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/inline_doc/normal.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/coding_style/inline_doc/normal.php
@@ -7,6 +7,9 @@
* @copyright ...
* @license ...
*/
+
+// @codingStandardsIgnoreFile
+
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_coding_style_inline_doc_normal
{
/**
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/property/normal_underscore.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/property/normal_underscore.php
index c722fe07a81..ff4ac13b9d0 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/property/normal_underscore.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/property/normal_underscore.php
@@ -2,6 +2,9 @@
/**
* @SuppressWarnings(PHPMD.UnusedPrivateField)
*/
+
+// @codingStandardsIgnoreFile
+
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_property_normal_underscore
{
private $_private = 1;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index e87c0716f88..e59ff9a6874 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Test\Php;
use Magento\Framework\Test\Utility;
diff --git a/dev/tests/unit/testsuite/Magento/AdminNotification/Block/ToolbarEntryTest.php b/dev/tests/unit/testsuite/Magento/AdminNotification/Block/ToolbarEntryTest.php
index 5e1486cb1fb..df21637b88d 100644
--- a/dev/tests/unit/testsuite/Magento/AdminNotification/Block/ToolbarEntryTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdminNotification/Block/ToolbarEntryTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\AdminNotification\Block\ToolbarEntry
*/
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/System/Config/Form/Field/ImageTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/System/Config/Form/Field/ImageTest.php
index 7592870e9e8..a8ca5011378 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Block/System/Config/Form/Field/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/System/Config/Form/Field/ImageTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Tests for \Magento\Framework\Data\Form\Element\Image
*/
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/System/Config/FormTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/System/Config/FormTest.php
index c5a1b48228a..07cf1d1eed0 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Block/System/Config/FormTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/System/Config/FormTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\System\Config;
class FormTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/ColumnSetTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/ColumnSetTest.php
index 1a04a905088..a5adc015623 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/ColumnSetTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/ColumnSetTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Block\Widget\Grid;
class ColumnSetTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Cache/CleanMediaTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Cache/CleanMediaTest.php
index da072d569e7..7f3fb0f9837 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Cache/CleanMediaTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Cache/CleanMediaTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Controller\Adminhtml\Cache;
class CleanMediaTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/AbstractTestCase.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/AbstractTestCase.php
index bdcdb6b7f0f..99ec1c0288a 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/AbstractTestCase.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/AbstractTestCase.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Controller\Adminhtml\Dashboard;
/**
@@ -46,4 +49,4 @@ class AbstractTestCase extends \PHPUnit_Framework_TestCase
$result = $controller->execute();
$this->assertInstanceOf('Magento\Framework\Controller\Result\Raw', $result);
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMostTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMostTest.php
index c3d08dccc63..9e6aa1a1fc0 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersMostTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Controller\Adminhtml\Dashboard;
/**
@@ -16,4 +19,4 @@ class CustomersMostTest extends AbstractTestCase
'Magento\Backend\Block\Dashboard\Tab\Customers\Most'
);
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewestTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewestTest.php
index 34174f545ac..5bc378ee3b4 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewestTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/CustomersNewestTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Controller\Adminhtml\Dashboard;
/**
@@ -16,4 +19,4 @@ class CustomersNewestTest extends AbstractTestCase
'Magento\Backend\Block\Dashboard\Tab\Customers\Newest'
);
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
index 13760c01d64..cf2b1be5dd0 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Controller\Adminhtml\Dashboard;
/**
@@ -16,4 +19,4 @@ class ProductsViewedTest extends AbstractTestCase
'Magento\Backend\Block\Dashboard\Tab\Products\Viewed'
);
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/Cookie/LifetimeTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/Cookie/LifetimeTest.php
index 29851754978..41d13fb57b8 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/Cookie/LifetimeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/Cookie/LifetimeTest.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Config\Backend\Cookie;
use Magento\Framework\Session\Config\Validator\CookieLifetimeValidator;
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/Cookie/PathTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/Cookie/PathTest.php
index 07686131cb6..ebcbec3608b 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/Cookie/PathTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Backend/Cookie/PathTest.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Config\Backend\Cookie;
use Magento\Framework\Session\Config\Validator\CookiePathValidator;
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Source/Storage/Media/DatabaseTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Source/Storage/Media/DatabaseTest.php
index a54e9a269d6..b6fee4bac4b 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Source/Storage/Media/DatabaseTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Source/Storage/Media/DatabaseTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Config\Source\Storage\Media;
use Magento\Framework\App\DeploymentConfig\ResourceConfig;
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/StructureTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/StructureTest.php
index 5b6ef58dc8c..7c03e3af8fc 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/StructureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/StructureTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Model\Config;
class StructureTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
index 74d4b10a1eb..2d7b0d4d673 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\Backend\Model\Url
*/
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/OptionTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/OptionTest.php
index c175bba7d17..b7945dad2f6 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/OptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/OptionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
class OptionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
index 4094f875f13..50d231147a0 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Block\Catalog\Product\View\Type;
use Magento\Bundle\Block\Catalog\Product\View\Type\Bundle as BundleBlock;
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
index 47c3e8d52b1..2250c7bc8cc 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Model;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Adjustment/CalculatorTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Adjustment/CalculatorTest.php
index ac5fbc2ef58..6bf40c3189e 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Adjustment/CalculatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Adjustment/CalculatorTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Pricing\Adjustment;
use Magento\Bundle\Model\Product\Price as ProductPrice;
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/DiscountCalculatorTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/DiscountCalculatorTest.php
index 581df0d0956..1e95b9c3836 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/DiscountCalculatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/DiscountCalculatorTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Pricing\Price;
use Magento\Catalog\Pricing\Price\FinalPrice;
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php
index 4dff0a77fce..1d5d39feb0d 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/GroupPriceTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Bundle\Pricing\Price;
class GroupPriceTest extends \PHPUnit_Framework_TestCase
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 be0554b982b..b27918ab113 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Block\Adminhtml\Category;
class AbstractCategoryTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Layer/ViewTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Layer/ViewTest.php
index b6e452abe69..8ba8436d3ad 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Layer/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Layer/ViewTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Block\Layer;
class ViewTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/AbstractProductTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/AbstractProductTest.php
index 5745e650450..b65408ca2e1 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/AbstractProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/AbstractProductTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Block\Product;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/ViewTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/ViewTest.php
index adc2c1894c8..9bae6624288 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/ViewTest.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Block\Product;
class ViewTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php
index b30b61a01c1..9dac4577e2c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Controller\Adminhtml\Category\Widget;
class CategoriesJsonTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php
index a13c96be969..75887932ef3 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Controller\Adminhtml\Category\Widget;
class ChooserTest extends \PHPUnit_Framework_TestCase
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 60cafb13995..a02bdcdfec9 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
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Controller\Product\Compare;
use Magento\Catalog\Model\Resource\Product\Compare\Item;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/App/Action/ContextPluginTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/App/Action/ContextPluginTest.php
index c38b82f9b89..1e131df3fc0 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/App/Action/ContextPluginTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/App/Action/ContextPluginTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\App\Action;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
index 30bb4837424..4afd091229c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Attribute\Backend;
use Magento\Framework\Object;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Backend/SortbyTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Backend/SortbyTest.php
index 8429250a06a..363dba4ed24 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Backend/SortbyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Backend/SortbyTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Category\Attribute\Backend;
class SortbyTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/AttributeRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/AttributeRepositoryTest.php
index ed60492b140..6b032d353e9 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/AttributeRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/AttributeRepositoryTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Category;
class AttributeRepositoryTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
index 27795b2501b..d1eb0ca38e3 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Category;
class TreeTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
index a63f7682958..8980b9fe6d7 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Category/AffectCacheTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Category/AffectCacheTest.php
index 21d1440527c..c3d4faaeac8 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Category/AffectCacheTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Category/AffectCacheTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Category;
class AffectCacheTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/AffectCacheTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/AffectCacheTest.php
index d2e8328def0..8149a75da88 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/AffectCacheTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/AffectCacheTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Product;
class AffectCacheTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
index 47a5cc9ca08..49df96737de 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
class EraserTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
index 22c1100a3d1..619c2916452 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
index 51855dbf341..6a34399408e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php
index 52b3b6a1fc8..7cf5724b1e1 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Indexer\Product\Price\Plugin;
class CustomerGroupTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/AvailabilityFlagTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/AvailabilityFlagTest.php
index 1348c634a00..5161790a00b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/AvailabilityFlagTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/AvailabilityFlagTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Layer\Category;
class AvailabilityFlagTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/CollectionFilterTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/CollectionFilterTest.php
index 973f7f3eff2..6629e512cfe 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/CollectionFilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/CollectionFilterTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Layer\Category;
class CollectionFilterTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
index df927d51a90..0a582c3752c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Layer\Category;
class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/FilterListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/FilterListTest.php
index 8873ba300b1..cb030eb9a89 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/FilterListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/FilterListTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Layer;
class FilterListTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
index b7a4da94d3b..20c12f6a4ce 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Layer\Search;
class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php
index bb911d04a89..023e059b375 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Layout;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/ManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/ManagementTest.php
index 8c9fac5e2e4..8eda004ea8a 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/ManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/ManagementTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product\Attribute;
class ManagementTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/RepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/RepositoryTest.php
index ee31d84d3ae..cb66e3d7627 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/RepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/RepositoryTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product\Attribute;
class RepositoryTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/StatusTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/StatusTest.php
index f1fb1f6c3c5..4e40eb93dba 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/StatusTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/StatusTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product\Attribute\Source;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/TypesListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/TypesListTest.php
index e429e821089..5a8ef299157 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/TypesListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/TypesListTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product\Attribute;
class TypesListTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php
index 53bb94fc97d..2d7f0fd62f7 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/LinkTypeProviderTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product;
class LinkTypeProviderTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Option/Validator/PoolTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Option/Validator/PoolTest.php
index af4fdb6d7de..df7d461c1a8 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Option/Validator/PoolTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Option/Validator/PoolTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product\Option\Validator;
class PoolTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/PriceModifierTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/PriceModifierTest.php
index 0f8dbe5516a..cd55c6c49ce 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/PriceModifierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/PriceModifierTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product;
class PriceModifierTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
index e9a9b8ec15b..f18ee8b5c3e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Product;
use Magento\Customer\Model\GroupManagement;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
index c94f539159a..3d2e0e07152 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
index e410f6b4fec..85e00714f27 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Resource\Category;
class TreeTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php
index 363a4056506..6e7f73f2ab8 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Eav/AttributeTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Resource\Eav;
use \Magento\Catalog\Model\Resource\Eav\Attribute;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Attribute/Backend/MediaTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Attribute/Backend/MediaTest.php
index 306d779e1f2..823bc7305f9 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Attribute/Backend/MediaTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Attribute/Backend/MediaTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Resource\Product\Attribute\Backend;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
index cbaa9833206..6ce43051315 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Model\Resource\Product\Option;
class CollectionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/BasePriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/BasePriceTest.php
index 577b8abf638..da0ce432644 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/BasePriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/BasePriceTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Pricing\Price;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php
index e3f452cc9c2..c947407edba 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/GroupPriceTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Pricing\Price;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/TierPriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/TierPriceTest.php
index c0c1f7bfe5e..ba717775a7b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/TierPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Pricing/Price/TierPriceTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Catalog\Pricing\Price;
use Magento\Customer\Model\Group;
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/CronTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/CronTest.php
index ada8e4c92e9..c2a8e41ff33 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/CronTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/CronTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogRule\Model;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CategoryTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CategoryTest.php
index c1521b2c77e..090aafbedcf 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CategoryTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogRule\Plugin\Indexer;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CustomerGroupTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CustomerGroupTest.php
index d468b48ef68..51748bc1a0d 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CustomerGroupTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CustomerGroupTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogRule\Plugin\Indexer;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/ImportExportTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/ImportExportTest.php
index d8816c9af2d..78c915f8d11 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/ImportExportTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/ImportExportTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogRule\Plugin\Indexer;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/WebsiteTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/WebsiteTest.php
index ff6dac40497..ef69b13b88b 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/WebsiteTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/WebsiteTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CatalogRule\Plugin\Indexer;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
index dee612d5bb9..e380d14a6d5 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Helper;
use Magento\Framework\App\Action\Action;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
index ddb71d0d481..20035d76b23 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Helper;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/Layout/DepersonalizePluginTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/Layout/DepersonalizePluginTest.php
index caba8173660..a871f4e6830 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/Layout/DepersonalizePluginTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/Layout/DepersonalizePluginTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Model\Layout;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
index d5bb6fe1b0f..d418bcb745b 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\Checkout\Model\Session
*/
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
index bad1ba8493c..6d0db00c22d 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Model\Type;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php
index 46358567666..d4203291ac3 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Address\Billing;
class WriteServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ConverterTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ConverterTest.php
index c4993a45099..fedaa1038b7 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ConverterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ConverterTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Address;
use Magento\Checkout\Service\V1\Data\Cart\Address;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Shipping/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Shipping/WriteServiceTest.php
index d8ba19ff325..654f89a3320 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Shipping/WriteServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Shipping/WriteServiceTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Address\Shipping;
class WriteServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ValidatorTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ValidatorTest.php
index 52fe4ee0589..8bafc8bbbf7 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ValidatorTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Address;
use Magento\Checkout\Service\V1\Data\Cart\Address;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php
index 04324909f39..80e2deb5862 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Cart\PaymentMethod;
class BuilderTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php
index 9e2c0ea62ad..4463a051bd9 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Cart\PaymentMethod;
use Magento\Checkout\Service\V1\Data\Cart\PaymentMethod;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php
index da0cdc677b3..0ce65b90b32 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Cart;
use Magento\Framework\Api\SearchCriteria;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/TotalsServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/TotalsServiceTest.php
index dae1d6b9e59..7c6d5d44c94 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/TotalsServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/TotalsServiceTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Cart;
class TotalsServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php
index 5e683c74434..7ff2a75a5e7 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Cart;
use Magento\Framework\Exception\CouldNotSaveException;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php
index 18f1afad761..752f466406e 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Coupon;
use Magento\Checkout\Service\V1\Data\Cart\Coupon as Coupon;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/WriteServiceTest.php
index 6e10100ae9b..e9e2fe6d248 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/WriteServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/WriteServiceTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Coupon;
class WriteServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/Cart/ShippingMethodConverterTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/Cart/ShippingMethodConverterTest.php
index 8987aa4f1e6..a3e5f5e5baa 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/Cart/ShippingMethodConverterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/Cart/ShippingMethodConverterTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Data\Cart;
class ShippingMethodConverterTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php
index 58f49fce129..6b9bf408aa2 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Data\PaymentMethod;
use Magento\Checkout\Service\V1\Data\PaymentMethod;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Item/ReaderServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Item/ReaderServiceTest.php
index 940bfd6272a..adc831d231b 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Item/ReaderServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Item/ReaderServiceTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\Item;
use Magento\Checkout\Service\V1\Data\Cart\Item as Item;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php
index 7bfdd2524ba..b38a7a8bbf4 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\PaymentMethod;
class ReadServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php
index 918124800a2..85bdaedec6c 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Checkout\Service\V1\PaymentMethod;
class WriteServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableImportExport/Model/Export/RowCustomizerTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableImportExport/Model/Export/RowCustomizerTest.php
index 125e01506a6..67a8c39095f 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableImportExport/Model/Export/RowCustomizerTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableImportExport/Model/Export/RowCustomizerTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ConfigurableImportExport\Model\Export;
class RowCustomizerTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Helper/DataTest.php
index ae2abde41c9..e2956b8fa27 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Helper/DataTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ConfigurableProduct\Helper;
class DataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
index 7f282cceff0..edf2462c469 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ConfigurableProduct\Model\Product\Type;
/**
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/PluginTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/PluginTest.php
index 6e5fcef1693..3059ade03dc 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/PluginTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/PluginTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ConfigurableProduct\Model\Product\Type;
/**
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Quote/Item/QuantityValidator/Initializer/Option/Plugin/ConfigurableProductTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Quote/Item/QuantityValidator/Initializer/Option/Plugin/ConfigurableProductTest.php
index 06ee725aa90..3576d8f94a8 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Quote/Item/QuantityValidator/Initializer/Option/Plugin/ConfigurableProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Quote/Item/QuantityValidator/Initializer/Option/Plugin/ConfigurableProductTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ConfigurableProduct\Model\Quote\Item\QuantityValidator\Initializer\Option\Plugin;
class ConfigurableProductTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/SuggestedAttributeListTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/SuggestedAttributeListTest.php
index f0d6bc8fa39..08c19635374 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/SuggestedAttributeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/SuggestedAttributeListTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\ConfigurableProduct\Model;
class SuggestedAttributeListTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
index 22211b87391..361a9147d67 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Contact\Controller\Index;
class IndexTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
index b5207f4f577..276ade4eae1 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Contact\Controller;
class IndexTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Contact/Helper/DataTest.php
index 9a4c562723a..02e03fec846 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Helper/DataTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Contact\Helper;
class DataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Core/App/Router/NoRouteHandlerTest.php b/dev/tests/unit/testsuite/Magento/Core/App/Router/NoRouteHandlerTest.php
index 2cc5967daf4..7a4aaa95f0c 100644
--- a/dev/tests/unit/testsuite/Magento/Core/App/Router/NoRouteHandlerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/App/Router/NoRouteHandlerTest.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\App\Router;
class NoRouteHandlerTest extends \Magento\Test\BaseTestCase
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/ThemeTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/ThemeTest.php
index eeb24e00d5f..89f0ff8f0ef 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/ThemeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/ThemeTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Helper;
class ThemeTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
index 2560e454160..f18e426f12d 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/App/EmulationTest.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\App;
class EmulationTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php
index 01fedc22451..2f979674770 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Asset;
class ConfigTest extends \Magento\Test\BaseTestCase
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Asset/Plugin/CleanMergedJsCssTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Asset/Plugin/CleanMergedJsCssTest.php
index c0b124e603b..ece9fdccd6b 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Asset/Plugin/CleanMergedJsCssTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Asset/Plugin/CleanMergedJsCssTest.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Asset\Plugin;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php
index fe5768540aa..d459eb8003f 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\Layout;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Image/PathTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Image/PathTest.php
index de3b022ae5a..22ebb73f8dd 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Image/PathTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Theme/Image/PathTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test of image path model
*/
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php
index 2304f6ff1be..bb8a12efc54 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/View/DesignTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Core\Model\View;
class DesignTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Account/Dashboard/InfoTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Account/Dashboard/InfoTest.php
index 4216c722b53..b8487b2297a 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Account/Dashboard/InfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Account/Dashboard/InfoTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Block\Account\Dashboard;
use Magento\Framework\Exception\NoSuchEntityException;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php
index 0cce2cb3e3f..3494b4474f9 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
use Magento\Customer\Api\AccountManagementInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php
index 63e82abc9ee..6bc6a7d7b84 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/DobTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Block\Widget;
use Magento\Framework\Exception\NoSuchEntityException;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/GenderTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/GenderTest.php
index 9ea96fad746..e8ba0a2920a 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/GenderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/GenderTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Block\Widget;
use Magento\Customer\Api\Data\CustomerInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
index 5aad6669d1f..b100b7661b7 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Block\Widget;
use Magento\Customer\Api\Data\AttributeMetadataInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
index 8e9d5099103..65d8c4b9bce 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Block\Widget;
use Magento\Framework\Exception\NoSuchEntityException;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
index ce15530aaae..ce3d60f7814 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Controller\Account;
use Magento\Customer\Helper\Address;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
index 6fbbddb9bc8..07586c22a98 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Controller\Account;
use Magento\Customer\Api\AccountManagementInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreateTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreateTest.php
index 93ce0d56de5..93f0f1f37f1 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreateTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Controller\Account;
class CreateTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
index 47f04e261c3..df9872a1796 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Controller\Adminhtml\Index;
use Magento\Customer\Api\Data\CustomerInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Ajax/LoginTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Ajax/LoginTest.php
index 2751cda1ee1..03943cf773e 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Ajax/LoginTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Ajax/LoginTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test customer ajax login controller
*/
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Helper/Session/CurrentCustomerTest.php b/dev/tests/unit/testsuite/Magento/Customer/Helper/Session/CurrentCustomerTest.php
index 2778332f6fc..01cc25afdd1 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Helper/Session/CurrentCustomerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Helper/Session/CurrentCustomerTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Helper\Session;
class CurrentCustomerTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php
index 425cd597eab..8f4fc57edf1 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model\Resource;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/GroupTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/GroupTest.php
index 694f9b79ef5..c669e5d7776 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/GroupTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Resource/GroupTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model\Resource;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php
index 662858bed44..dd73a542952 100644
--- a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php
+++ b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\CustomerImportExport\Model\Import;
use Magento\Framework\Filesystem\Driver\File;
diff --git a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
index 7a9aa71f0ff..13e4eb08225 100644
--- a/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
+++ b/dev/tests/unit/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\CustomerImportExport\Model\Import\Customer
*/
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 564b2ad3ac6..ea5cf91b73d 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\DesignEditor\Controller\Varien\Router;
class StandardTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php
index 00158413afe..d4586d3b506 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/Resource/Country/CollectionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Directory\Model\Resource\Country;
class CollectionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/AbstractDataTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/AbstractDataTest.php
index f1d427f3744..294ffca613c 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/AbstractDataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/AbstractDataTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Attribute\Data;
class AbstractDataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php
index 1560e4e3048..6880a016eb3 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/FileTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Attribute\Data;
class FileTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php
index 626e8b99683..8bddc1e2252 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Attribute/Data/ImageTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Attribute\Data;
class ImageTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/AttributeManagementTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/AttributeManagementTest.php
index 03959f7ef8f..2f8acf66481 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/AttributeManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/AttributeManagementTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model;
use Magento\Framework\Exception\NoSuchEntityException;
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/Source/BooleanTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/Source/BooleanTest.php
index 4850fbbcd47..90b0884ecc9 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/Source/BooleanTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/Source/BooleanTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Entity\Attribute\Source;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
index b7bfd64d583..b6d40ce7c33 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Resource\Attribute;
class CollectionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/AttributeTest.php
index d71079bcd85..947e15858bf 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/AttributeTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Model\Resource\Entity;
class AttributeTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Plugin/Model/Resource/Entity/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Eav/Plugin/Model/Resource/Entity/AttributeTest.php
index b4814c92230..9353b3d0762 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Plugin/Model/Resource/Entity/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Plugin/Model/Resource/Entity/AttributeTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Eav\Plugin\Model\Resource\Entity;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
index 97acc066c40..e2c54c4f00a 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Email\Block\Adminhtml\Template;
class PreviewTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Action/ActionTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Action/ActionTest.php
index a28e4ab127c..9200c47ad4c 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Action/ActionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Action/ActionTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\App\Action;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/AreaListTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/AreaListTest.php
index 566594220be..a4bcccb8bc7 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/AreaListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/AreaListTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\App;
class AreaListTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/BootstrapTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/BootstrapTest.php
index 986ad6a02af..59aec77d003 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/BootstrapTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/BootstrapTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\App;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/ObjectManager/ConfigLoaderTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/ObjectManager/ConfigLoaderTest.php
index 61c5ba85004..0bf381f9a5b 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/ObjectManager/ConfigLoaderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/ObjectManager/ConfigLoaderTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\App\ObjectManager;
class ConfigLoaderTest extends \PHPUnit_Framework_TestCase
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 48140770efc..40530f66723 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\App\Request;
use Magento\Framework\App\Request\Http as Request;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/ResourceTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/ResourceTest.php
index 9c928641c86..7b7957d6fbd 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/ResourceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/ResourceTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\App;
class ResourceTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/StaticResourceTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/StaticResourceTest.php
index 25ffcac9bdd..31808c05bb3 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/StaticResourceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/StaticResourceTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\App;
class StaticResourceTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Autoload/ClassLoaderWrapperTest.php b/dev/tests/unit/testsuite/Magento/Framework/Autoload/ClassLoaderWrapperTest.php
index 66bfa5c5ef7..f340912df93 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Autoload/ClassLoaderWrapperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Autoload/ClassLoaderWrapperTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Autoload;
use Composer\Autoload\ClassLoader;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Cache/CoreTest.php b/dev/tests/unit/testsuite/Magento/Framework/Cache/CoreTest.php
index e9d37a5d1f9..3fe7035fb4f 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Cache/CoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Cache/CoreTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* \Magento\Framework\Cache\Core test case
*/
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Reader/_files/ClassesForArgumentsReader.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Reader/_files/ClassesForArgumentsReader.php
index 37b79aa8449..e5043aef8f9 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Code/Reader/_files/ClassesForArgumentsReader.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Reader/_files/ClassesForArgumentsReader.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
class ClassWithAllArgumentTypes
{
const DEFAULT_VALUE = 'Const Value';
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForArgumentSequence.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForArgumentSequence.php
index da2693ceafe..8fd7d25b71c 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForArgumentSequence.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForArgumentSequence.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace ArgumentSequence;
class ContextObject implements \Magento\Framework\ObjectManager\ContextInterface
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForConstructorIntegrity.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForConstructorIntegrity.php
index 3f5728a081c..ec4793e4f91 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForConstructorIntegrity.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForConstructorIntegrity.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
class ClassA
{
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForContextAggregation.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForContextAggregation.php
index fbb19917b9d..b4f8248570c 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForContextAggregation.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForContextAggregation.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
class ClassFirst
{
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForTypeDuplication.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForTypeDuplication.php
index 29764b911ba..5d26f6ae3ca 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForTypeDuplication.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/_files/ClassesForTypeDuplication.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace TypeDuplication;
interface ArgumentInterface
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/Composer/PackageTest.php b/dev/tests/unit/testsuite/Magento/Framework/Config/Composer/PackageTest.php
index 03759d24c02..b7b8b55841b 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/Composer/PackageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Config/Composer/PackageTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Config\Composer;
class PackageTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/DataTest.php b/dev/tests/unit/testsuite/Magento/Framework/Config/DataTest.php
index 22f55ab0ba6..6329fd74499 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Config/DataTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Config;
class DataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/DB/AbstractMapperTest.php b/dev/tests/unit/testsuite/Magento/Framework/DB/AbstractMapperTest.php
index 7ccd46efefa..223bf328f93 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/DB/AbstractMapperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/DB/AbstractMapperTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\DB;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php b/dev/tests/unit/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
index f073f7f6250..60b5c4d9f04 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* \Magento\Framework\DB\Adapter\Pdo\Mysql class test
*/
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php b/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php
index 34dbe81ac59..2e9407b2d62 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Data/Collection/DbTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Data\Collection;
class DbTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/AbstractElementTest.php b/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/AbstractElementTest.php
index 9e28e2437cd..9f457093b39 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/AbstractElementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/AbstractElementTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Tests for \Magento\Framework\Data\Form\Element\AbstractElement
*/
diff --git a/dev/tests/unit/testsuite/Magento/Framework/File/CsvTest.php b/dev/tests/unit/testsuite/Magento/Framework/File/CsvTest.php
index 84d4264812c..27062a4abd9 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/File/CsvTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/File/CsvTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\Framework\File\Csv.
*/
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/Code/Generator/InterceptorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/Code/Generator/InterceptorTest.php
index 117368c8d09..63923900063 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/Code/Generator/InterceptorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/Code/Generator/InterceptorTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Code\Generator;
class InterceptorTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/Code/InterfaceValidatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/Code/InterfaceValidatorTest.php
index a0f69f7303e..95fec76a36b 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/Code/InterfaceValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/Code/InterfaceValidatorTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Code;
class InterfaceValidatorTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/ExtraParameters.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/ExtraParameters.php
index 9334c5663f5..c875acf177a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/ExtraParameters.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/ExtraParameters.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Custom\Module\Model\InterfaceValidator\ItemPlugin;
class ExtraParameters
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsCount.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsCount.php
index 791a5c82422..ea33862ec17 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsCount.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsCount.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Custom\Module\Model\InterfaceValidator\ItemPlugin;
class IncompatibleArgumentsCount
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsType.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsType.php
index 53545ade3b6..02bc1345f30 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsType.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsType.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Custom\Module\Model\InterfaceValidator\ItemPlugin;
class IncompatibleArgumentsType
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/InvalidProceed.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/InvalidProceed.php
index 6aba9346b04..a133b09d023 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/InvalidProceed.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/InvalidProceed.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Custom\Module\Model\InterfaceValidator\ItemPlugin;
class InvalidProceed
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/ValidPlugin.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/ValidPlugin.php
index e6c9060066c..a4664725764 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/ValidPlugin.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/Custom/Module/Model/InterfaceValidator/ItemPlugin/ValidPlugin.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Custom\Module\Model\InterfaceValidator\ItemPlugin;
class ValidPlugin
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Less/FileGeneratorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Less/FileGeneratorTest.php
index 9d59b0a818b..7a5a85b2142 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Less/FileGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Less/FileGeneratorTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Less;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Less/PreProcessor/Instruction/ImportTest.php b/dev/tests/unit/testsuite/Magento/Framework/Less/PreProcessor/Instruction/ImportTest.php
index 8cded2c0b64..6270db5f1dd 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Less/PreProcessor/Instruction/ImportTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Less/PreProcessor/Instruction/ImportTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Less\PreProcessor\Instruction;
class ImportTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Less/PreProcessor/Instruction/MagentoImportTest.php b/dev/tests/unit/testsuite/Magento/Framework/Less/PreProcessor/Instruction/MagentoImportTest.php
index 761a6bee5a8..aee67c8b7a4 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Less/PreProcessor/Instruction/MagentoImportTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Less/PreProcessor/Instruction/MagentoImportTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Less\PreProcessor\Instruction;
class MagentoImportTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Locale/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Locale/ConfigTest.php
index 09efd05e404..e8b76bc4547 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Locale/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Locale/ConfigTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Locale;
class ConfigTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Locale/CurrencyTest.php b/dev/tests/unit/testsuite/Magento/Framework/Locale/CurrencyTest.php
index af11d14133a..7fbe9654af0 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Locale/CurrencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Locale/CurrencyTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Locale;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/AbstractDbTest.php b/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/AbstractDbTest.php
index 4911958db6a..0a410e47023 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/AbstractDbTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/AbstractDbTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Model\Resource\Db;
class AbstractDbTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractCollectionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractCollectionTest.php
index 8212036d79c..d22c172e0f2 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Model/Resource/Db/Collection/AbstractCollectionTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Model\Resource\Db\Collection;
use Magento\Framework\Object as MagentoObject;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Mview/Config/Data/ProxyTest.php b/dev/tests/unit/testsuite/Magento/Framework/Mview/Config/Data/ProxyTest.php
index 6239850ab11..125981b2d0c 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Mview/Config/Data/ProxyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Mview/Config/Data/ProxyTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Mview\Config\Data;
class ProxyTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Mview/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Mview/ConfigTest.php
index 4fe20738441..7a417e9ea13 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Mview/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Mview/ConfigTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Mview;
class ConfigTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Mview/View/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Mview/View/CollectionTest.php
index 8b03c593317..d5ddaefd6e4 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Mview/View/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Mview/View/CollectionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Mview\View;
class CollectionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Mview/View/SubscriptionFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Mview/View/SubscriptionFactoryTest.php
index 1d65b1a1b32..50eab75ab12 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Mview/View/SubscriptionFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Mview/View/SubscriptionFactoryTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Mview\View;
class SubscriptionFactoryTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Mview/View/SubscriptionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Mview/View/SubscriptionTest.php
index 33e6ce43774..4103091a8c5 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Mview/View/SubscriptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Mview/View/SubscriptionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Mview\View;
class SubscriptionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Config/Reader/_files/ConfigDomMock.php b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Config/Reader/_files/ConfigDomMock.php
index 06a229d25e5..5c3297ae73a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Config/Reader/_files/ConfigDomMock.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Config/Reader/_files/ConfigDomMock.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
class ConfigDomMock extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Phrase/Renderer/CompositeTest.php b/dev/tests/unit/testsuite/Magento/Framework/Phrase/Renderer/CompositeTest.php
index 9b333381b04..bb173cd2559 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Phrase/Renderer/CompositeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Phrase/Renderer/CompositeTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Phrase\Renderer;
class CompositeTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
index 1348e691e7f..0e47d1988d1 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\Framework\Session\Config
*/
diff --git a/dev/tests/unit/testsuite/Magento/Framework/ShellTest.php b/dev/tests/unit/testsuite/Magento/Framework/ShellTest.php
index 71075b07749..4a77a6aca9e 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/ShellTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/ShellTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework;
class ShellTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php b/dev/tests/unit/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
index 671b12ea40a..0b2d7406a4b 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Stdlib\Cookie;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieManagerTest.php
index 055bc74586a..606ae7937d6 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieManagerTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
// @codingStandardsIgnoreStart
namespace {
$mockTranslateSetCookie = false;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php b/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
index de6c9f4b227..0b263a4e494 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Framework/ValidatorFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/ValidatorFactoryTest.php
index 496be625178..65bc41aad90 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/ValidatorFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/ValidatorFactoryTest.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MergedTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MergedTest.php
index 0075409fc18..06f2dd55762 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MergedTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MergedTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Asset;
class MergedTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ModuleNotation/ResolverTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ModuleNotation/ResolverTest.php
index 7d7dfce5aa1..f32832d703f 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ModuleNotation/ResolverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ModuleNotation/ResolverTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Asset\ModuleNotation;
class ResolverTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/PreProcessor/ModuleNotationTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/PreProcessor/ModuleNotationTest.php
index 3494e9b0618..6a8798aef23 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/PreProcessor/ModuleNotationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/PreProcessor/ModuleNotationTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Asset\PreProcessor;
class ModuleNotationTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/RepositoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/RepositoryTest.php
index 7fc3c15a3e3..20959aeb3fc 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/RepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/RepositoryTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Asset;
class RepositoryTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
index 08079b95dd1..13dfa486ff5 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Asset;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/BlockPoolTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/BlockPoolTest.php
index c57b4687869..fa0a5304355 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/BlockPoolTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/BlockPoolTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/DataSourcePoolTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/DataSourcePoolTest.php
index 0943caf4863..5541878c93f 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/DataSourcePoolTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/DataSourcePoolTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/CacheData/FlatTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/CacheData/FlatTest.php
index 651367a3bd5..54a2390ab2f 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/CacheData/FlatTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/CacheData/FlatTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Design\FileResolution\Fallback\CacheData;
class FlatTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/CacheData/GroupedTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/CacheData/GroupedTest.php
index 42b8152b14f..75ae3a23075 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/CacheData/GroupedTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/CacheData/GroupedTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Design\FileResolution\Fallback\CacheData;
class GroupedTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/AlternativeTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/AlternativeTest.php
index 51f1f79b7a7..c53ce990723 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/AlternativeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/AlternativeTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Design\FileResolution\Fallback\Resolver;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/SimpleTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/SimpleTest.php
index b0a88281728..bbd1227b4f9 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/SimpleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/SimpleTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Design\FileResolution\Fallback\Resolver;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php
index 406399dfcda..d6ac0fb0760 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Design/Theme/ImageTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test theme image model
*/
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Decorator/ModuleDependencyTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Decorator/ModuleDependencyTest.php
index fd0fec48b1d..2baf978e897 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Decorator/ModuleDependencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Decorator/ModuleDependencyTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\File\Collector\Decorator;
class ModuleDependencyTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Decorator/ModuleOutputTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Decorator/ModuleOutputTest.php
index 4146f771366..d9887ff4d56 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Decorator/ModuleOutputTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Decorator/ModuleOutputTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\File\Collector\Decorator;
class ModuleOutputTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Override/BaseTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Override/BaseTest.php
index 9f133a61ca7..e18e12c3b00 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Override/BaseTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Override/BaseTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\File\Collector\Override;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Override/ThemeModularTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Override/ThemeModularTest.php
index 7d0c32c164c..b5170c5fca7 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Override/ThemeModularTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/File/Collector/Override/ThemeModularTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\File\Collector\Override;
use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/File/FileListTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/File/FileListTest.php
index 3665577b027..9cfb6f25081 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/File/FileListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/File/FileListTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\File;
class FileListTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/FileSystemTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/FileSystemTest.php
index 1dd3114e845..72ad1e78c39 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/FileSystemTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/FileSystemTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test for view filesystem model
*/
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Layout/Reader/MoveTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Layout/Reader/MoveTest.php
index c504a0c62ae..4c8c6437ea1 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Layout/Reader/MoveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Layout/Reader/MoveTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Layout\Reader;
use Magento\Framework\View\Layout\ScheduledStructure;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Result/LayoutTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Result/LayoutTest.php
index a3bce8163ed..49970f6da99 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Result/LayoutTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Result/LayoutTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\View\Result;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/TemplateEngine/_files/simple.phtml b/dev/tests/unit/testsuite/Magento/Framework/View/TemplateEngine/_files/simple.phtml
index bbcf8b73186..039af8f1788 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/TemplateEngine/_files/simple.phtml
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/TemplateEngine/_files/simple.phtml
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
?>
<html><?php
$this->testMethod();
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/GiftMessageManagerTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/GiftMessageManagerTest.php
index 2261826231b..d87abc0ed85 100644
--- a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/GiftMessageManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/GiftMessageManagerTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\GiftMessage\Model;
class GiftMessageManagerTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/Type/Plugin/OnepageTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/Type/Plugin/OnepageTest.php
index a276752d4f1..0451bcfe160 100644
--- a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/Type/Plugin/OnepageTest.php
+++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/Type/Plugin/OnepageTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\GiftMessage\Model\Type\Plugin;
class OnepageTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Service/V1/ReadServiceTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Service/V1/ReadServiceTest.php
index c63e2dd3992..2bf23488ecb 100644
--- a/dev/tests/unit/testsuite/Magento/GiftMessage/Service/V1/ReadServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Service/V1/ReadServiceTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\GiftMessage\Service\V1;
class ReadServiceTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Indexer/Model/Processor/InvalidateCacheTest.php b/dev/tests/unit/testsuite/Magento/Indexer/Model/Processor/InvalidateCacheTest.php
index bd30ec79c46..ad299f594b5 100644
--- a/dev/tests/unit/testsuite/Magento/Indexer/Model/Processor/InvalidateCacheTest.php
+++ b/dev/tests/unit/testsuite/Magento/Indexer/Model/Processor/InvalidateCacheTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Indexer\Model\Processor;
class InvalidateCacheTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/DeleteTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/DeleteTest.php
index 07e0a94f88f..b1558ee5bd8 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/DeleteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/DeleteTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Integration\Controller\Adminhtml\Integration;
use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/EditTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/EditTest.php
index 406be4339fc..2388f76d34c 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/EditTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/EditTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Integration\Controller\Adminhtml\Integration;
use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/NewActionTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/NewActionTest.php
index 3eec1df0c4b..c3c39f65b16 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/NewActionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/NewActionTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Integration\Controller\Adminhtml\Integration;
class NewActionTest extends \Magento\Integration\Controller\Adminhtml\IntegrationTest
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialogTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialogTest.php
index 05f22f64ecf..693cb158bd4 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialogTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialogTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Integration\Controller\Adminhtml\Integration;
use Magento\Framework\View\Layout\Element as LayoutElement;
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/SaveTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/SaveTest.php
index fc65180d490..07d2cd1e1df 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/SaveTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Integration\Controller\Adminhtml\Integration;
use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/TokensDialogTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/TokensDialogTest.php
index fce26a11d7b..10e0e688e61 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/TokensDialogTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/Integration/TokensDialogTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Integration\Controller\Adminhtml\Integration;
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php
index 9daf41a124f..6e7932735e6 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Integration\Oauth;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AdminTokenServiceTest.php b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AdminTokenServiceTest.php
index e69c373d791..b2a1a317688 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AdminTokenServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/AdminTokenServiceTest.php
@@ -5,6 +5,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Integration\Service\V1;
use Magento\Integration\Model\Integration;
diff --git a/dev/tests/unit/testsuite/Magento/Msrp/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Msrp/Helper/DataTest.php
index 9590d75057f..4d6dfc50b40 100644
--- a/dev/tests/unit/testsuite/Magento/Msrp/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Msrp/Helper/DataTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Msrp\Helper;
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 2b87525d0ba..8a22471bce6 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Block\Checkout\Address;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php
index f1e1ba1c0a0..98d3bff6d22 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Block\Checkout;
use Magento\Sales\Model\Quote\Address;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Payment/InfoTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Payment/InfoTest.php
index 1935a36c940..a7ce1291040 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Payment/InfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Payment/InfoTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Block\Checkout\Payment;
class InfoTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
index 2a89729348c..9a3d8e93439 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Block\Checkout;
use Magento\Framework\Pricing\PriceCurrencyInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/StateTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/StateTest.php
index 002875c92f6..2e3e367fade 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/StateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/StateTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Block\Checkout;
class StateTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
index e2b54595d34..9add1cd7517 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Block\Checkout;
class SuccessTest extends \PHPUnit_Framework_TestCase
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 458b6a186d1..422821efe81 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
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 3ba5dec0909..d7467c8edba 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
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 fd8ca051567..43d68e77aef 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
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 0c3925db9b7..3fb83cbb10b 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
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 a0e703c3e20..8b9f12539ba 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
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Multishipping\Controller\Checkout\Address;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Newsletter/Controller/Manage/SaveTest.php b/dev/tests/unit/testsuite/Magento/Newsletter/Controller/Manage/SaveTest.php
index e9ae0cf0b38..c140de1a059 100644
--- a/dev/tests/unit/testsuite/Magento/Newsletter/Controller/Manage/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Newsletter/Controller/Manage/SaveTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Newsletter\Controller\Manage;
use Magento\Framework\Exception\NoSuchEntityException;
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Controller/Block/EsiTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Controller/Block/EsiTest.php
index cee299481f3..2cd91f81250 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Controller/Block/EsiTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Controller/Block/EsiTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\PageCache\Controller\Block;
class EsiTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Controller/Block/RenderTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Controller/Block/RenderTest.php
index 7fd3cd3d354..163d642fe0e 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Controller/Block/RenderTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Controller/Block/RenderTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\PageCache\Controller\Block;
class RenderTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Model/Controller/Result/BuiltinPluginTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/Controller/Result/BuiltinPluginTest.php
index c36e168ea3d..ff37a47604b 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Model/Controller/Result/BuiltinPluginTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/Controller/Result/BuiltinPluginTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\PageCache\Model\Controller\Result;
class BuiltinPluginTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/FlushAllCacheTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/FlushAllCacheTest.php
index 68ae59f6057..e79eb4a2864 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/FlushAllCacheTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/FlushAllCacheTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\PageCache\Model\Observer;
class FlushAllCacheTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/FlushCacheByTagsTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/FlushCacheByTagsTest.php
index 21814a1c3f6..42ef3eea4ef 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/FlushCacheByTagsTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/FlushCacheByTagsTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\PageCache\Model\Observer;
class FlushCacheByTagsTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/ProcessLayoutRenderElementTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/ProcessLayoutRenderElementTest.php
index d6d289037dc..148ab10d0f3 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/ProcessLayoutRenderElementTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/ProcessLayoutRenderElementTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\PageCache\Model\Observer;
class ProcessLayoutRenderElementTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/FormTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/FormTest.php
index 727348dc885..ee15ae647ea 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Block/FormTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Block/FormTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Payment\Block;
use Magento\Framework\Object;
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
index 8986f9e3837..1f47da26976 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Payment\Block\Info;
class SubstitutionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Model/Config/Source/AllmethodsTest.php b/dev/tests/unit/testsuite/Magento/Payment/Model/Config/Source/AllmethodsTest.php
index 6332424244a..94d223ad336 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Model/Config/Source/AllmethodsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Model/Config/Source/AllmethodsTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Payment\Model\Config\Source;
class AllmethodsTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
index 4e2d75ea2e7..0a7a834e22e 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Payment\Model;
use Magento\Store\Model\ScopeInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Model/MethodListTest.php b/dev/tests/unit/testsuite/Magento/Payment/Model/MethodListTest.php
index c4dc8081188..07c27db5051 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Model/MethodListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Model/MethodListTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Payment\Model;
class MethodListTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/ApplyBlockPersistentDataTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/ApplyBlockPersistentDataTest.php
index 0721fd63004..28b3b3b7eac 100644
--- a/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/ApplyBlockPersistentDataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/ApplyBlockPersistentDataTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Persistent\Model\Observer;
class ApplyBlockPersistentDataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/RemovePersistentCookieTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/RemovePersistentCookieTest.php
index 8b3e6f5f2c8..a50a1666cbe 100644
--- a/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/RemovePersistentCookieTest.php
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/RemovePersistentCookieTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Persistent\Model\Observer;
class RemovePersistentCookieTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/UpdateCustomerCookiesTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/UpdateCustomerCookiesTest.php
index 33c8360aead..ba53bb124dd 100644
--- a/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/UpdateCustomerCookiesTest.php
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Model/Observer/UpdateCustomerCookiesTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Persistent\Model\Observer;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Model/QuoteManagerTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Model/QuoteManagerTest.php
index a03f9a48444..1a7d33201e3 100644
--- a/dev/tests/unit/testsuite/Magento/Persistent/Model/QuoteManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Model/QuoteManagerTest.php
@@ -4,6 +4,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Persistent\Model;
class QuoteManagerTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php b/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php
index 69d555efe55..7a203670c91 100644
--- a/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Reports/Model/Resource/Report/Collection/AbstractCollectionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Reports\Model\Resource\Report\Collection;
class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
@@ -48,4 +51,4 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
$this->_model->setIsSubTotals(false);
$this->assertFalse($this->_model->isSubTotals());
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php b/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
index 966eac3eb0d..bfc47a2b5b4 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Review\Controller\Adminhtml\Product;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Rss/Model/RssManagerTest.php b/dev/tests/unit/testsuite/Magento/Rss/Model/RssManagerTest.php
index d3c6a2e2ba1..42550e8aa15 100644
--- a/dev/tests/unit/testsuite/Magento/Rss/Model/RssManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rss/Model/RssManagerTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Rss\Model;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php b/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
index e2b16fea4a8..0d59e735313 100644
--- a/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Rss\Model;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php
index e5eaaccb1eb..52b4c89bf62 100644
--- a/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rule/Model/Condition/Product/AbstractProductTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Rule\Model\Condition\Product;
use ReflectionMethod;
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
index dd392679ad8..505b8a82540 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Block\Adminhtml\Order\Create\Items;
class GridTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/TotalsTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/TotalsTest.php
index 79deefa5c8c..019448993cb 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/TotalsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/TotalsTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Block\Adminhtml\Order\Create;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Email/Items/DefaultItemsTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Email/Items/DefaultItemsTest.php
index dcf22b9f81e..ade7d612760 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Email/Items/DefaultItemsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Email/Items/DefaultItemsTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Block\Order\Email\Items;
class DefaultItemsTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrderTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrderTest.php
index 7f2e7b55693..27b32f3f7de 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrderTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Block\Order\Email\Items\Order;
class DefaultOrderTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Item/Renderer/DefaultRendererTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Item/Renderer/DefaultRendererTest.php
index 037184e8e34..4c11c684f63 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Item/Renderer/DefaultRendererTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Item/Renderer/DefaultRendererTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Block\Order\Item\Renderer;
class DefaultRendererTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
index b07ed3c1225..d3733118cef 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
class SaveTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/Quote/Item/CompareTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/Quote/Item/CompareTest.php
index f7fb1140622..f8f4c8743cf 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/Quote/Item/CompareTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/Quote/Item/CompareTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Helper\Quote\Item;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index 7a6214ef4f6..cdd97519a2e 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\AdminOrder;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Grid/Child/CollectionUpdaterTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Grid/Child/CollectionUpdaterTest.php
index a8c8dbf205e..db2d2e120db 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Grid/Child/CollectionUpdaterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Grid/Child/CollectionUpdaterTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Grid\Child;
class CollectionUpdaterTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Grid/CollectionUpdaterTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Grid/CollectionUpdaterTest.php
index 26c89fe6093..2bf23dec6d9 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Grid/CollectionUpdaterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Grid/CollectionUpdaterTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Grid;
class CollectionUpdaterTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Backend/CustomerQuoteTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Backend/CustomerQuoteTest.php
index 6bf211f5c26..3cbba164451 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Backend/CustomerQuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Backend/CustomerQuoteTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Observer\Backend;
class CustomerQuoteTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php
index c098b04913b..da6338831ce 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Observer/Frontend/Quote/Address/CollectTotalsTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Observer\Frontend\Quote\Address;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Creditmemo/Total/TaxTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Creditmemo/Total/TaxTest.php
index bf1a3485a1c..50e3222d7aa 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Creditmemo/Total/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Creditmemo/Total/TaxTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order\Creditmemo\Total;
use Magento\Framework\Object as MagentoObject;
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 7e746c92e69..2281c1cd624 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order;
use Magento\Sales\Model\Resource\OrderFactory;
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/ShippingTest.php
index c4a03afbd75..97cd3d07826 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/ShippingTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order\Invoice\Total;
class ShippingTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/InvoiceTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/InvoiceTest.php
index 2c0359006b8..0352b2bc91b 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/InvoiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/InvoiceTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Order;
use Magento\Sales\Model\Resource\OrderFactory;
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/AddressTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/AddressTest.php
index a3a7cbe61f0..7bb4d088318 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/AddressTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Quote;
use Magento\Store\Model\ScopeInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/ItemTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/ItemTest.php
index ae2bec1ebe6..02b355ca649 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/ItemTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Quote/ItemTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Quote;
class ItemTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
index f8597c45e51..2df6831b0ef 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model;
use Magento\Sales\Model\Quote\Address;
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/GridPoolTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/GridPoolTest.php
index 659753f8b8d..e5043d883f2 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/GridPoolTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/GridPoolTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Resource;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
index 3f2b304c15c..d85816db63f 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Resource/Order/StatusTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Model\Resource\Order;
/**
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
index 25e0312732b..34d66cef119 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\SalesRule\Model\Resource\Report;
class CollectionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrackTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
index bd6a7501e36..355715ad198 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
use Magento\Backend\App\Action;
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
index 095e8db8128..d71f1fc519a 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
use Magento\Backend\App\Action;
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Model/ShipmentTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Model/ShipmentTest.php
index 64fee5a0ea3..f8c6dbf614d 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Model/ShipmentTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Model/ShipmentTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Shipping\Model;
use Magento\Sales\Model\Resource\OrderFactory;
diff --git a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/ContextTest.php b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/ContextTest.php
index 0980d33f46e..267306c9302 100644
--- a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/ContextTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/ContextTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Store\App\Action\Plugin;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
index 78d664fba54..11cb06f6ebf 100644
--- a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Store\App\Action\Plugin;
class StoreCheckTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/ReaderPoolTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/ReaderPoolTest.php
index a0d8769e133..83632b7070e 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/ReaderPoolTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/ReaderPoolTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Store\Model\Config\Reader;
class ReaderPoolTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
index 542595fb040..d72b2acad81 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
@@ -3,6 +3,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Store\Model\Storage;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
index 27915e5bd7a..7c6b2742e38 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Store\Model;
use Magento\Framework\App\Config\ReinitableConfigInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Cart/Sidebar/TotalsTest.php b/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Cart/Sidebar/TotalsTest.php
index ae4eb2b7d0e..8db8a8612df 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Cart/Sidebar/TotalsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Block/Checkout/Cart/Sidebar/TotalsTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Block\Checkout\Cart\Sidebar;
use Magento\Framework\Object;
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
index c6cd649c02d..fc0e221a7f2 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Helper;
use Magento\Framework\Object as MagentoObject;
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
index 9b0f2daaa9d..78bb472f837 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Model\Calculation;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Config/TaxClassTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Config/TaxClassTest.php
index a79821a4a1c..16186b3a4a0 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Config/TaxClassTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Config/TaxClassTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\Tax\Model\Config\TaxClass
*/
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
index 4b5a55b7eb7..d92a81311fe 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\Tax\Model\Config
*/
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
index 26a7e189f42..43aabc9e3dc 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Model\Sales\Total\Quote;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/ShippingTest.php
index b4bdb92c385..29dde2f9f02 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/ShippingTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Model\Sales\Total\Quote;
class ShippingTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index f684763168f..58f08ff8068 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tax\Model\Sales\Total\Quote;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
index 8b4662e216b..b2aabe17d13 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Theme\Block\Adminhtml\System\Design\Theme\Tab;
class CssTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/Url/Plugin/SignatureTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Url/Plugin/SignatureTest.php
index e61539bd72b..6739feebd6d 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/Url/Plugin/SignatureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Url/Plugin/SignatureTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Theme\Model\Url\Plugin;
class SignatureTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/ArgumentsResolverTest.php b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/ArgumentsResolverTest.php
index 92de43dd322..8ef62e0519e 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/ArgumentsResolverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/ArgumentsResolverTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tools\Di\Compiler;
class ArgumentsResolverTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/Definition/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Tools/Di/Definition/CollectionTest.php
index fcd6ed55b73..d51844a4cde 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/Definition/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/Definition/CollectionTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tools\Di\Definition;
/**
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/ParserTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/ParserTest.php
index 805c73c038b..0a1b7e9514c 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/ParserTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/ParserTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tools\I18n\Parser;
use Magento\Tools\I18n\Parser as Parser;
diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
index 7f9db1c58b5..cfb8d279cb2 100644
--- a/dev/tests/unit/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
+++ b/dev/tests/unit/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\UrlRewrite\Block\Catalog\Edit;
use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Storage/DbStorageTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Storage/DbStorageTest.php
index 8b0fe1f2a17..579dd03a4eb 100644
--- a/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Storage/DbStorageTest.php
+++ b/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Storage/DbStorageTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\UrlRewrite\Model\Storage;
use Magento\Framework\App\Resource;
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Controller/RestTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Controller/RestTest.php
index 15856b87210..18d6421c25a 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Controller/RestTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Controller/RestTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Webapi\Controller;
use Magento\Authorization\Model\UserContextInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Controller/Soap/Request/HandlerTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Controller/Soap/Request/HandlerTest.php
index 8d980bc40f7..ce2063eb9b7 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Controller/Soap/Request/HandlerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Controller/Soap/Request/HandlerTest.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Webapi\Controller\Soap\Request;
use Magento\Framework\Api\SimpleDataObjectConverter;
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/_files/test_interfaces.php b/dev/tests/unit/testsuite/Magento/Webapi/_files/test_interfaces.php
index 5edc27a9685..17f8013c623 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/_files/test_interfaces.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/_files/test_interfaces.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Module\Service;
/**
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 6a47ac0eea7..07188e92cf5 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
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Test class for \Magento\Weee\Model\Attribute\Backend\Weee\Tax
*/
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Pricing/AdjustmentTest.php b/dev/tests/unit/testsuite/Magento/Weee/Pricing/AdjustmentTest.php
index 8128e1b1b09..9490589f172 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Pricing/AdjustmentTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Pricing/AdjustmentTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Weee\Pricing;
use Magento\Framework\Pricing\Object\SaleableInterface;
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
index fab22b9c611..99e7a849ebb 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Wishlist\Model\Rss;
class WishlistTest extends \PHPUnit_Framework_TestCase
diff --git a/lib/internal/Magento/Framework/Acl/Resource/Provider.php b/lib/internal/Magento/Framework/Acl/Resource/Provider.php
index 0168c1a303a..2c5807d784f 100644
--- a/lib/internal/Magento/Framework/Acl/Resource/Provider.php
+++ b/lib/internal/Magento/Framework/Acl/Resource/Provider.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Acl\Resource;
class Provider implements ProviderInterface
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File.php b/lib/internal/Magento/Framework/Archive/Helper/File.php
index 22c4ed76ea6..5e5cdc8af3e 100644
--- a/lib/internal/Magento/Framework/Archive/Helper/File.php
+++ b/lib/internal/Magento/Framework/Archive/Helper/File.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Helper class that simplifies files stream reading and writing
*/
diff --git a/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php b/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
index 66eaacffb8a..8c2c1e559b9 100644
--- a/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
+++ b/lib/internal/Magento/Framework/Archive/Helper/File/Gz.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Helper class that simplifies gz files stream reading and writing
*/
diff --git a/lib/internal/Magento/Framework/Backup/Archive/Tar.php b/lib/internal/Magento/Framework/Backup/Archive/Tar.php
index c5bfd7af492..0fa6cbb2492 100644
--- a/lib/internal/Magento/Framework/Backup/Archive/Tar.php
+++ b/lib/internal/Magento/Framework/Backup/Archive/Tar.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Extended version of \Magento\Framework\Archive\Tar that supports filtering
*
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php b/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
index 9712a66ba0b..11a02cc970f 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Backup\Db;
class BackupFactory
diff --git a/lib/internal/Magento/Framework/Backup/Factory.php b/lib/internal/Magento/Framework/Backup/Factory.php
index 3a1735c75c4..63d844ae00d 100644
--- a/lib/internal/Magento/Framework/Backup/Factory.php
+++ b/lib/internal/Magento/Framework/Backup/Factory.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Backup;
class Factory
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem.php b/lib/internal/Magento/Framework/Backup/Filesystem.php
index b2b0add03da..9c65ecbf236 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Backup;
/**
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Database.php b/lib/internal/Magento/Framework/Cache/Backend/Database.php
index ee8e1a89f33..a12de8add65 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Database.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
Tables declaration:
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php b/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
index 739b2a832ad..1e275b32109 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Cache\Backend;
class Eaccelerator extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
index a18c7a734a2..5b726f37728 100644
--- a/lib/internal/Magento/Framework/Config/Dom.php
+++ b/lib/internal/Magento/Framework/Config/Dom.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Magento configuration XML DOM utility
*/
diff --git a/lib/internal/Magento/Framework/CurrencyFactory.php b/lib/internal/Magento/Framework/CurrencyFactory.php
index cb7b44b485c..9d9aa26bbdd 100644
--- a/lib/internal/Magento/Framework/CurrencyFactory.php
+++ b/lib/internal/Magento/Framework/CurrencyFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework;
class CurrencyFactory
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 919699158c5..ff6a3b5ce5e 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\DB\Adapter\Pdo;
use Magento\Framework\Cache\FrontendInterface;
diff --git a/lib/internal/Magento/Framework/DB/MapperFactory.php b/lib/internal/Magento/Framework/DB/MapperFactory.php
index 9995c5587a9..5444423848c 100644
--- a/lib/internal/Magento/Framework/DB/MapperFactory.php
+++ b/lib/internal/Magento/Framework/DB/MapperFactory.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\DB;
/**
diff --git a/lib/internal/Magento/Framework/DB/QueryFactory.php b/lib/internal/Magento/Framework/DB/QueryFactory.php
index a6da22b5930..d21a71d845f 100644
--- a/lib/internal/Magento/Framework/DB/QueryFactory.php
+++ b/lib/internal/Magento/Framework/DB/QueryFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\DB;
/**
diff --git a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
index 1b12e7aab20..5adb1f112e4 100644
--- a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Mysql DB Statement
*
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index d8417a67d69..9a075d9d920 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Data\Form\Element;
use Magento\Framework\Escaper;
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
index 8a0c8a4a6ae..794ad2d8488 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Category form input image element
*
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Time.php b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
index 98ce8886b35..fe721a31f84 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Time.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Form time element
*
diff --git a/lib/internal/Magento/Framework/Data/FormFactory.php b/lib/internal/Magento/Framework/Data/FormFactory.php
index 349c74e8a1d..83d4eb9b3c8 100644
--- a/lib/internal/Magento/Framework/Data/FormFactory.php
+++ b/lib/internal/Magento/Framework/Data/FormFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Data;
/**
diff --git a/lib/internal/Magento/Framework/Encryption/Crypt.php b/lib/internal/Magento/Framework/Encryption/Crypt.php
index c95d48665b3..61d7648397d 100644
--- a/lib/internal/Magento/Framework/Encryption/Crypt.php
+++ b/lib/internal/Magento/Framework/Encryption/Crypt.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Encryption;
/**
diff --git a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
index 771ef1085a3..89466bc17a8 100644
--- a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
+++ b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Event\Invoker;
use Magento\Framework\Event\Observer;
diff --git a/lib/internal/Magento/Framework/File/Csv.php b/lib/internal/Magento/Framework/File/Csv.php
index 9c5a6740780..9a6b107d01f 100644
--- a/lib/internal/Magento/Framework/File/Csv.php
+++ b/lib/internal/Magento/Framework/File/Csv.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\File;
/**
diff --git a/lib/internal/Magento/Framework/File/CsvMulty.php b/lib/internal/Magento/Framework/File/CsvMulty.php
index 4e1c654fe40..062f61b2388 100644
--- a/lib/internal/Magento/Framework/File/CsvMulty.php
+++ b/lib/internal/Magento/Framework/File/CsvMulty.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Csv parse
*
diff --git a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
index b50c4874dd2..4af85a7a6d7 100644
--- a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
+++ b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\File\Transfer\Adapter;
class Http
diff --git a/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php b/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
index 6b8f9300732..eb688bd6cb8 100644
--- a/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
+++ b/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Filter\Input;
class MaliciousCode implements \Zend_Filter_Interface
diff --git a/lib/internal/Magento/Framework/Gdata/Gshopping/HttpException.php b/lib/internal/Magento/Framework/Gdata/Gshopping/HttpException.php
index 8af0a157150..06a787f906c 100644
--- a/lib/internal/Magento/Framework/Gdata/Gshopping/HttpException.php
+++ b/lib/internal/Magento/Framework/Gdata/Gshopping/HttpException.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Gdata\Gshopping;
/**
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
index d9702d7e330..53de5cec1cc 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* HTTP CURL Adapter
*
diff --git a/lib/internal/Magento/Framework/HTTP/Header.php b/lib/internal/Magento/Framework/HTTP/Header.php
index 933b3a2b937..fdf7ebfbfde 100644
--- a/lib/internal/Magento/Framework/HTTP/Header.php
+++ b/lib/internal/Magento/Framework/HTTP/Header.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\HTTP;
/**
diff --git a/lib/internal/Magento/Framework/Image/Factory.php b/lib/internal/Magento/Framework/Image/Factory.php
index f7b48a48230..ebaa79d74b0 100644
--- a/lib/internal/Magento/Framework/Image/Factory.php
+++ b/lib/internal/Magento/Framework/Image/Factory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Image;
use Magento\Framework\ObjectManagerInterface;
diff --git a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
index 53bd630f3b0..2790f37166d 100644
--- a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
+++ b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Interception\Code\Generator;
class Interceptor extends \Magento\Framework\Code\Generator\EntityAbstract
diff --git a/lib/internal/Magento/Framework/Io/Sftp.php b/lib/internal/Magento/Framework/Io/Sftp.php
index 2ed666aa87b..fff0e876ccb 100644
--- a/lib/internal/Magento/Framework/Io/Sftp.php
+++ b/lib/internal/Magento/Framework/Io/Sftp.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Io;
/**
diff --git a/lib/internal/Magento/Framework/Less/PreProcessor/Instruction/Import.php b/lib/internal/Magento/Framework/Less/PreProcessor/Instruction/Import.php
index 26adfb470ad..d4bfee72f7f 100644
--- a/lib/internal/Magento/Framework/Less/PreProcessor/Instruction/Import.php
+++ b/lib/internal/Magento/Framework/Less/PreProcessor/Instruction/Import.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Less\PreProcessor\Instruction;
use Magento\Framework\View\Asset\LocalInterface;
diff --git a/lib/internal/Magento/Framework/Locale/Lists.php b/lib/internal/Magento/Framework/Locale/Lists.php
index 9297a08df36..0ce28dda50f 100644
--- a/lib/internal/Magento/Framework/Locale/Lists.php
+++ b/lib/internal/Magento/Framework/Locale/Lists.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Locale;
class Lists implements \Magento\Framework\Locale\ListsInterface
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 24897f7acf1..243632928a4 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Mail\Template;
class TransportBuilder
diff --git a/lib/internal/Magento/Framework/Message/Factory.php b/lib/internal/Magento/Framework/Message/Factory.php
index eb6ddf0ed6a..f9c7f51cb5e 100644
--- a/lib/internal/Magento/Framework/Message/Factory.php
+++ b/lib/internal/Magento/Framework/Message/Factory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Message;
use Magento\Framework\ObjectManagerInterface;
diff --git a/lib/internal/Magento/Framework/Model/Resource/AbstractResource.php b/lib/internal/Magento/Framework/Model/Resource/AbstractResource.php
index 0d5a11c7b55..3ee152e5e2f 100644
--- a/lib/internal/Magento/Framework/Model/Resource/AbstractResource.php
+++ b/lib/internal/Magento/Framework/Model/Resource/AbstractResource.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Model\Resource;
/**
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 b82cc776430..7a8efc589fd 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Model\Resource\Db\Collection;
/**
diff --git a/lib/internal/Magento/Framework/Model/Resource/Type/Db/Pdo/Mysql.php b/lib/internal/Magento/Framework/Model/Resource/Type/Db/Pdo/Mysql.php
index 848be00e52d..f71cb570ba1 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Type/Db/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Type/Db/Pdo/Mysql.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Model\Resource\Type\Db\Pdo;
use Magento\Framework\App\Resource\ConnectionAdapterInterface;
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index d5b04050fd4..4dae9043044 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Module\Plugin;
use Magento\Framework\Cache\FrontendInterface;
diff --git a/lib/internal/Magento/Framework/Module/Resource.php b/lib/internal/Magento/Framework/Module/Resource.php
index bad4056e69b..658d5e8b549 100644
--- a/lib/internal/Magento/Framework/Module/Resource.php
+++ b/lib/internal/Magento/Framework/Module/Resource.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Module;
diff --git a/lib/internal/Magento/Framework/Module/Setup/MigrationFactory.php b/lib/internal/Magento/Framework/Module/Setup/MigrationFactory.php
index 20cec5dab7f..a9ab782ac63 100644
--- a/lib/internal/Magento/Framework/Module/Setup/MigrationFactory.php
+++ b/lib/internal/Magento/Framework/Module/Setup/MigrationFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Module\Setup;
/**
diff --git a/lib/internal/Magento/Framework/Mview/ActionFactory.php b/lib/internal/Magento/Framework/Mview/ActionFactory.php
index f981c63c2c4..32cc21a864c 100644
--- a/lib/internal/Magento/Framework/Mview/ActionFactory.php
+++ b/lib/internal/Magento/Framework/Mview/ActionFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Mview;
class ActionFactory
diff --git a/lib/internal/Magento/Framework/Mview/View.php b/lib/internal/Magento/Framework/Mview/View.php
index 925bfd4a545..e4def87e9f1 100644
--- a/lib/internal/Magento/Framework/Mview/View.php
+++ b/lib/internal/Magento/Framework/Mview/View.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Mview;
/**
diff --git a/lib/internal/Magento/Framework/Mview/View/Subscription.php b/lib/internal/Magento/Framework/Mview/View/Subscription.php
index 545ee3dc709..cae9006e3ff 100644
--- a/lib/internal/Magento/Framework/Mview/View/Subscription.php
+++ b/lib/internal/Magento/Framework/Mview/View/Subscription.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Mview\View;
class Subscription implements SubscriptionInterface
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Persistor.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Persistor.php
index 1a62645d567..fb478ba6cd4 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Persistor.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Persistor.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\ObjectManager\Code\Generator;
/**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
index c1ab90e4f89..775f40644f2 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\ObjectManager\Code\Generator;
/**
diff --git a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
index c4297dd6e9f..4f27aefbd85 100644
--- a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
@@ -5,6 +5,9 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\ObjectManager;
use Magento\Framework\Api\Code\Generator\DataBuilder as DataBuilderGenerator;
diff --git a/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php b/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
index bb4c3ee2e8f..f89d1be3251 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Pricing\Render;
use Magento\Framework\Pricing\Amount\AmountInterface;
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Factory.php b/lib/internal/Magento/Framework/Profiler/Driver/Factory.php
index 447bd5bcbb6..26e0da2e97b 100644
--- a/lib/internal/Magento/Framework/Profiler/Driver/Factory.php
+++ b/lib/internal/Magento/Framework/Profiler/Driver/Factory.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Profiler\Driver;
use Magento\Framework\Profiler\DriverInterface;
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateInterface.php
index b77d959b4f6..0bf0a4f3031 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Stdlib\DateTime;
interface DateInterface
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
index 29d1897a22a..3615561c520 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Stdlib\DateTime;
interface TimezoneInterface
diff --git a/lib/internal/Magento/Framework/Translate/Adapter.php b/lib/internal/Magento/Framework/Translate/Adapter.php
index 3e8fe9ffb3f..5af7934cb43 100644
--- a/lib/internal/Magento/Framework/Translate/Adapter.php
+++ b/lib/internal/Magento/Framework/Translate/Adapter.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Magento translate adapter
*/
diff --git a/lib/internal/Magento/Framework/Translate/AdapterInterface.php b/lib/internal/Magento/Framework/Translate/AdapterInterface.php
index 5df5ac73f21..efbb760464d 100644
--- a/lib/internal/Magento/Framework/Translate/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/Translate/AdapterInterface.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Magento translate adapter interface
*/
diff --git a/lib/internal/Magento/Framework/Translate/Inline.php b/lib/internal/Magento/Framework/Translate/Inline.php
index 5e51404920c..c3cbbc129a8 100644
--- a/lib/internal/Magento/Framework/Translate/Inline.php
+++ b/lib/internal/Magento/Framework/Translate/Inline.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Translate;
class Inline implements \Magento\Framework\Translate\InlineInterface
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
index 7b4b6baedab..4e6ce8112e2 100644
--- a/lib/internal/Magento/Framework/Url.php
+++ b/lib/internal/Magento/Framework/Url.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework;
/**
diff --git a/lib/internal/Magento/Framework/UrlFactory.php b/lib/internal/Magento/Framework/UrlFactory.php
index ebfa053c171..006f4658abf 100644
--- a/lib/internal/Magento/Framework/UrlFactory.php
+++ b/lib/internal/Magento/Framework/UrlFactory.php
@@ -2,6 +2,9 @@
/**
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework;
class UrlFactory
diff --git a/lib/internal/Magento/Framework/Validator/Builder.php b/lib/internal/Magento/Framework/Validator/Builder.php
index 86645c60050..88170fd724d 100644
--- a/lib/internal/Magento/Framework/Validator/Builder.php
+++ b/lib/internal/Magento/Framework/Validator/Builder.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Validator;
use Magento\Framework\Validator\Constraint\OptionInterface;
diff --git a/lib/internal/Magento/Framework/Validator/Constraint/Property.php b/lib/internal/Magento/Framework/Validator/Constraint/Property.php
index 3ff4c43f602..61c79783ae5 100644
--- a/lib/internal/Magento/Framework/Validator/Constraint/Property.php
+++ b/lib/internal/Magento/Framework/Validator/Constraint/Property.php
@@ -4,6 +4,9 @@
*
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Validator\Constraint;
class Property extends \Magento\Framework\Validator\Constraint
diff --git a/lib/internal/Magento/Framework/Validator/ConstraintFactory.php b/lib/internal/Magento/Framework/Validator/ConstraintFactory.php
index 8ef00d71761..30a851c637b 100644
--- a/lib/internal/Magento/Framework/Validator/ConstraintFactory.php
+++ b/lib/internal/Magento/Framework/Validator/ConstraintFactory.php
@@ -3,6 +3,8 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
*/
+// @codingStandardsIgnoreFile
+
/**
* Factory class for \Magento\Framework\Validator\Constraint
*/
--
GitLab
From f38cc64f9512d6efca462187ed12f6463ee5a122 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 14 Jan 2015 15:28:12 +0200
Subject: [PATCH 056/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- removed ignore annotations from statics
---
.../phpmd/input/cyclomatic_complexity.php | 1 -
.../CodeMessTest/phpmd/input/descendant_count.php | 3 ---
.../CodeMessTest/phpmd/input/field_count.php | 1 -
.../CodeMessTest/phpmd/input/method_length.php | 1 -
.../CodeMessTest/phpmd/input/parameter_list.php | 1 -
.../phpmd/input/prohibited_statement.php | 6 ------
.../phpmd/input/prohibited_statement_goto.php | 3 ---
.../CodeMessTest/phpmd/input/public_count.php | 1 -
.../Php/Exemplar/CodeMessTest/phpmd/input/unused.php | 12 ------------
.../phpcs/input/naming/constant/minuscule_letter.php | 3 ---
.../input/naming/method/normal_underscore_start.php | 3 ---
11 files changed, 35 deletions(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/cyclomatic_complexity.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/cyclomatic_complexity.php
index 2795d100cc8..e78ad0a73d1 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/cyclomatic_complexity.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/cyclomatic_complexity.php
@@ -4,7 +4,6 @@ abstract class Foo
{
/**
* Method that violates the allowed cyclomatic complexity
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function bar()
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/descendant_count.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/descendant_count.php
index 4c035e76005..a559b0c1f59 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/descendant_count.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/descendant_count.php
@@ -1,8 +1,5 @@
<?php
-/**
- * @SuppressWarnings(PHPMD.NumberOfChildren)
- */
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_descendant_count
{
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/field_count.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/field_count.php
index 397ece72b54..3e07302931d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/field_count.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/field_count.php
@@ -2,7 +2,6 @@
/**
* Class that violates the allowed field number
- * @SuppressWarnings(PHPMD.TooManyFields)
*/
abstract class Foo
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/method_length.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/method_length.php
index 2f0ca8b5370..48a58a39dbe 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/method_length.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/method_length.php
@@ -4,7 +4,6 @@ class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_method_length
{
/**
* Method that violates the allowed method length
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function bar() // 001
{ // 002
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/parameter_list.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/parameter_list.php
index 30b9260dbaa..59f733a5301 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/parameter_list.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/parameter_list.php
@@ -4,7 +4,6 @@ class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_parameter_list
{
/**
* Method that violates the allowed parameter list length
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function bar($param1, $param2, $param3, $param4, $param5, $param6, $param7, $param8, $param9, $param10)
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement.php
index 49dc3365e49..17639a25e72 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement.php
@@ -2,17 +2,11 @@
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_prohibited_statement
{
- /**
- * @SuppressWarnings(PHPMD.ExitExpression)
- */
public function terminateApplication($exitCode = 0)
{
exit($exitCode);
}
- /**
- * @SuppressWarnings(PHPMD.EvalExpression)
- */
public function evaluateExpression($expression)
{
return eval($expression);
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement_goto.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement_goto.php
index 8fe82d85b96..69cbbddcbf6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement_goto.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/prohibited_statement_goto.php
@@ -2,9 +2,6 @@
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_prohibited_statement_goto
{
- /**
- * @SuppressWarnings(PHPMD.GotoStatement)
- */
public function loopArrayCallback(array $array, $callback)
{
$index = 0;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/public_count.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/public_count.php
index cede88939f0..89cc599042d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/public_count.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/public_count.php
@@ -7,7 +7,6 @@
*
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.TooManyMethods)
- * @SuppressWarnings(PHPMD.ExcessivePublicCount)
*/
abstract class Foo
{
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/unused.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/unused.php
index f5edffd765b..c1b9b30a59c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/unused.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/unused.php
@@ -1,25 +1,13 @@
<?php
-/**
- * @SuppressWarnings(PHPMD.UnusedPrivateField)
- */
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_unused
{
private $_unusedField;
- /**
- * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
- */
private function _unusedMethod()
{
}
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- */
- /**
- * @SuppressWarnings(PHPMD.UnusedLocalVariable)
- */
public function bar($unusedParameter)
{
$unusedLocalVariable = 'unused value';
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
index 9f2166f5946..ae52ab28aed 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
@@ -1,9 +1,6 @@
<?php
define('SOME_CONSTaNT_2_ACT_4_YOU', 42);
define("SOME_CONSTaNT_2_ACT_4_YOU", 2783);
-/**
- * @SuppressWarnings(PHPMD.ConstantNamingConventions)
- */
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_constant_minuscule_letter
{
const SOME_LONG_CONSTaNT_2_ACT_4_YOU = 1;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
index 6fffaa5f938..eb8932a74cc 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
@@ -1,9 +1,6 @@
<?php
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_method_normal_underscore_start
{
- /**
- * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
- */
private function _testFunctionPrivate()
{
}
--
GitLab
From e09331306f0c668858e32d5d368d0abe096740b0 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 14 Jan 2015 17:44:53 +0200
Subject: [PATCH 057/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- removed annotation
---
.../Test/Php/Exemplar/CodeMessTest/phpmd/input/naming.php | 5 -----
1 file changed, 5 deletions(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/naming.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/naming.php
index 22280954a78..d2b6e1de984 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/naming.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input/naming.php
@@ -1,8 +1,5 @@
<?php
-/**
- * @SuppressWarnings(PHPMD.ConstantNamingConventions)
- */
class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_naming
{
const nonUppercaseName = false;
@@ -31,7 +28,6 @@ class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_naming
/**
* Too short method name
- * @SuppressWarnings(PHPMD.ShortMethodName)
*/
protected function _x()
{
@@ -40,7 +36,6 @@ class Magento_Test_Php_Exemplar_CodeMessTest_phpmd_input_naming
/**
* Getter that returns boolean value should be named 'is...()' or 'has...()'
* @return bool
- * @SuppressWarnings(PHPMD.BooleanGetMethodName)
*/
public function getBoolValue()
{
--
GitLab
From 76cd19e6f2955612512750650443a7013f31837f Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 14 Jan 2015 18:26:47 +0200
Subject: [PATCH 058/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- Fixed test to use phpmd installed with composer
---
.../CodingStandard/Tool/CodeMessDetector.php | 10 +++++-----
.../static/testsuite/Magento/Test/Php/LiveCodeTest.php | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php
index f52b7d64d21..753de6b8b37 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeMessDetector.php
@@ -45,7 +45,7 @@ class CodeMessDetector implements ToolInterface
*/
public function canRun()
{
- return class_exists('PHP_PMD_TextUI_Command');
+ return class_exists('PHPMD\TextUI\Command');
}
/**
@@ -54,7 +54,7 @@ class CodeMessDetector implements ToolInterface
public function run(array $whiteList)
{
if (empty($whiteList)) {
- return \PHP_PMD_TextUI_Command::EXIT_SUCCESS;
+ return \PHPMD\TextUI\Command::EXIT_SUCCESS;
}
$commandLineArguments = [
@@ -66,10 +66,10 @@ class CodeMessDetector implements ToolInterface
$this->reportFile,
];
- $options = new \PHP_PMD_TextUI_CommandLineOptions($commandLineArguments);
+ $options = new \PHPMD\TextUI\CommandLineOptions($commandLineArguments);
- $command = new \PHP_PMD_TextUI_Command();
+ $command = new \PHPMD\TextUI\Command();
- return $command->run($options, new \PHP_PMD_RuleSetFactory());
+ return $command->run($options, new \PHPMD\RuleSetFactory());
}
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index e59ff9a6874..22273585ab2 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -12,7 +12,7 @@ use Magento\TestFramework\CodingStandard\Tool\CodeMessDetector;
use Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper;
use Magento\TestFramework\CodingStandard\Tool\CopyPasteDetector;
-use PHP_PMD_TextUI_Command;
+use PHPMD\TextUI\Command;
use PHPUnit_Framework_TestCase;
use Magento\Framework\Test\Utility\Files;
@@ -170,7 +170,7 @@ class LiveCodeTest extends PHPUnit_Framework_TestCase
}
$this->assertEquals(
- PHP_PMD_TextUI_Command::EXIT_SUCCESS,
+ Command::EXIT_SUCCESS,
$codeMessDetector->run(self::getWhitelist(['php'])),
"PHP Code Mess has found error(s): See detailed report in {$reportFile}"
);
--
GitLab
From 0c19e64863787ce8e279e6aefa27999498ce88a3 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Wed, 14 Jan 2015 18:27:57 +0200
Subject: [PATCH 059/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- Fixed copyrights in merged files
---
.../AbstractAssertTaxCalculationAfterCheckoutDownloadable.php | 3 ++-
.../AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php | 3 ++-
...culationAfterCheckoutDownloadableExcludingIncludingTax.php | 3 ++-
...ertTaxCalculationAfterCheckoutDownloadableExcludingTax.php | 3 ++-
...ertTaxCalculationAfterCheckoutDownloadableIncludingTax.php | 3 ++-
...eIsAppliedToAllPricesDownloadableExcludingIncludingTax.php | 3 ++-
...ertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php | 3 ++-
...ertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php | 3 ++-
.../DownloadableProductInjectable/GroupPriceOptions.php | 3 ++-
.../Test/TestCase/DownloadableTaxCalculationTest.php | 3 ++-
.../tests/app/Magento/Downloadable/Test/etc/scenario.xml | 3 ++-
.../Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php | 3 ++-
.../Constraint/AbstractAssertTaxCalculationAfterCheckout.php | 3 ++-
.../AssertOrderTaxOnBackendExcludingIncludingTax.php | 3 ++-
.../Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php | 3 ++-
.../Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php | 3 ++-
...AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php | 3 ++-
.../AssertTaxCalculationAfterCheckoutExcludingTax.php | 4 ++--
.../AssertTaxCalculationAfterCheckoutIncludingTax.php | 3 ++-
...AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php | 3 ++-
.../AssertTaxRuleIsAppliedToAllPricesExcludingTax.php | 3 ++-
.../AssertTaxRuleIsAppliedToAllPricesIncludingTax.php | 3 ++-
22 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
index 290600821df..f8bf3012cfa 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
index 35da65f95f2..bd74cdb32ae 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
index a686bf97175..1132a5eba4d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
index 6244b27448f..f2674893728 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
index 65bef8f5c92..88ee73b5067 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
index 4882be04642..a19281b101d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
index 8845f254596..a48b94174bc 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
index 2ce8b695acb..61a282eda03 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
index 374f9be0460..2d0b2c8f339 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/GroupPriceOptions.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
index e9316abf81d..82b90a1bbec 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Downloadable\Test\TestCase;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
index ce97ab96f36..d5d21016c52 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<!--
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
-->
<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
index 982a52c8bff..aa63949e9de 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
index 097b0873f8d..debc24c79bb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
index 66ecdadac13..1851caffdb0 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
index 56a46a082f9..9b0c4846f27 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
index 71b228adcc3..8843f04669a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
index 29040ace551..e4219643ae8 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
index dba356b8e41..e925881d8ad 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
@@ -1,8 +1,8 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
-
namespace Magento\Tax\Test\Constraint;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
index 89611a8946d..e7079263b0e 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
index a5badd6fd90..55ea81d13ce 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
index 165d6cd23ac..8088fe6e3da 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
index ce12c61fbf1..9e7fbe7ef37 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesIncludingTax.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\Constraint;
--
GitLab
From e7e2426cfc697cd5f4f82fb8dae6a2136868eaf2 Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Wed, 14 Jan 2015 19:08:59 +0200
Subject: [PATCH 060/120] MAGETWO-25084: [GITHUB] About ByPercent.php under
different currencies #581
---
.../SalesRule/Model/Rule/Action/Discount/ByPercent.php | 4 +++-
.../SalesRule/Model/Rule/Action/Discount/ByPercentTest.php | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
index afab1eded3d..7940fc5df84 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
@@ -57,7 +57,9 @@ class ByPercent extends AbstractDiscount
$discountData->setAmount(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct);
$discountData->setBaseAmount(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct);
$discountData->setOriginalAmount(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
- $discountData->setBaseOriginalAmount(($qty * $baseItemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
+ $discountData->setBaseOriginalAmount(
+ ($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct
+ );
if (!$rule->getDiscountQty() || $rule->getDiscountQty() > $qty) {
$discountPercent = min(100, $item->getDiscountPercent() + $rulePercent);
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php
index 9f911786fed..e7c9747626f 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php
@@ -209,7 +209,7 @@ class ByPercentTest extends \PHPUnit_Framework_TestCase
'amount' => 42,
'baseAmount' => 25.5,
'originalAmount' => 51,
- 'baseOriginalAmount' => 46.5,
+ 'baseOriginalAmount' => 34.5,
],
]
];
--
GitLab
From 268808daa72a7fa80ab764ab3e204a4f04d26c35 Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Wed, 14 Jan 2015 13:54:58 -0600
Subject: [PATCH 061/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- updated copyright statements
---
.../CatalogRule/Test/TestStep/CreateCatalogRuleStep.php | 6 ++----
.../app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php | 6 ++----
.../functional/tests/app/Magento/Tax/Test/etc/scenario.xml | 6 ++----
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
index f0c087db7ab..f17c6b39621 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
@@ -1,9 +1,7 @@
<?php
/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license {license_link}
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\CatalogRule\Test\TestStep;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
index 94bc1cd3b81..e90c0be6bc4 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
@@ -1,9 +1,7 @@
<?php
/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license {license_link}
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Tax\Test\TestStep;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
index a1d4d406e4f..356993adf01 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
@@ -1,10 +1,8 @@
<?xml version="1.0"?>
<!--
/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license {license_link}
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
-->
<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
--
GitLab
From a1c5c33d885a186a5e7064064c0555324bd7dca1 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Thu, 15 Jan 2015 10:17:54 +0200
Subject: [PATCH 062/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- added new defects annotations after merge
---
app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php | 1 +
.../Magento/Catalog/Block/Product/ProductList/Toolbar.php | 1 +
app/code/Magento/Catalog/Block/Product/View.php | 1 +
.../Model/Resource/Product/Indexer/Price/DefaultPrice.php | 1 +
app/code/Magento/Catalog/Pricing/Render/PriceBox.php | 1 +
.../Model/Resource/Indexer/Stock/DefaultStock.php | 1 +
app/code/Magento/CatalogRule/Model/Resource/Rule.php | 3 +++
.../Magento/CatalogSearch/Model/Layer/Filter/Price.php | 1 +
app/code/Magento/Dhl/Model/Carrier.php | 1 +
app/code/Magento/Downloadable/Model/Product/Type.php | 1 +
.../Eav/Model/Entity/Attribute/Backend/AbstractBackend.php | 4 ++++
app/code/Magento/Payment/Model/Method/AbstractMethod.php | 1 +
app/code/Magento/Sales/Model/Order/Payment/Transaction.php | 1 +
app/code/Magento/Sales/Model/Order/Shipment/Track.php | 1 +
app/code/Magento/Sales/Model/Quote/Payment.php | 1 +
.../Magento/Shipping/Model/Carrier/AbstractCarrier.php | 7 +++++++
app/code/Magento/Store/Model/Storage/Db.php | 1 +
app/code/Magento/Ui/Component/Form.php | 1 +
app/code/Magento/Ui/Component/Layout/AbstractStructure.php | 1 +
app/code/Magento/Ui/Component/Listing.php | 1 +
.../Magento/Tax/Model/Calculation/RateRepositoryTest.php | 3 +++
lib/internal/Magento/Framework/DB/Tree.php | 3 +++
lib/internal/Magento/Framework/Event/Observer/Cron.php | 1 +
lib/internal/Magento/Framework/Filesystem/Driver/Http.php | 2 ++
lib/internal/Magento/Framework/HTTP/Client/Socket.php | 2 ++
.../Framework/Interception/PluginList/PluginList.php | 3 +++
lib/internal/Magento/Framework/Translate/Inline.php | 1 +
27 files changed, 46 insertions(+)
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index 411ac7cf445..b69238d5e19 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -79,6 +79,7 @@ class Calculator implements BundleCalculatorInterface
* @param null|string $exclude
* @param null|array $context
* @return \Magento\Framework\Pricing\Amount\AmountInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getAmount($amount, SaleableInterface $saleableItem, $exclude = null, $context = [])
{
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index ebac80d1bbb..4b286dda352 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -12,6 +12,7 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
*
* @author Magento Core Team <core@magentocommerce.com>
* @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Toolbar extends \Magento\Framework\View\Element\Template
{
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index ee82d0c10c5..459dfa92322 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -9,6 +9,7 @@ use Magento\Catalog\Model\Product;
/**
* Product View block
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class View extends AbstractProduct implements \Magento\Framework\View\Block\IdentityInterface
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php
index c5763f1ac0a..d90b71eb418 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php
@@ -643,6 +643,7 @@ class DefaultPrice extends \Magento\Catalog\Model\Resource\Product\Indexer\Abstr
*
* @param string $table
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getIdxTable($table = null)
{
diff --git a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
index a99acfa5cb5..4b2cbf9a802 100644
--- a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
@@ -38,6 +38,7 @@ class PriceBox extends PriceBoxRender
* @param Data $coreDataHelper
* @param Random $mathRandom
* @param array $data
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
Context $context,
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
index a212b6c13dd..9201ec2a4f1 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
@@ -280,6 +280,7 @@ class DefaultStock extends \Magento\Catalog\Model\Resource\Product\Indexer\Abstr
*
* @param string $table
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getIdxTable($table = null)
{
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
index c190214d713..3a4cbe36ca4 100644
--- a/app/code/Magento/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -14,6 +14,9 @@ use Magento\Catalog\Model\Product;
use Magento\Framework\Model\AbstractModel;
use Magento\Framework\Pricing\PriceCurrencyInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Rule extends \Magento\Rule\Model\Resource\AbstractResource
{
/**
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index 4081154e8e6..67fbe038458 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -54,6 +54,7 @@ class Price extends AbstractFilter
* @param \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory $algorithmFactory
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index aaf416d8e92..1558e774f3a 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1306,6 +1306,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
*
* @param \Magento\Framework\Object|null $params
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getContainerTypes(\Magento\Framework\Object $params = null)
{
diff --git a/app/code/Magento/Downloadable/Model/Product/Type.php b/app/code/Magento/Downloadable/Model/Product/Type.php
index 28621b660e5..614674ba26c 100644
--- a/app/code/Magento/Downloadable/Model/Product/Type.php
+++ b/app/code/Magento/Downloadable/Model/Product/Type.php
@@ -495,6 +495,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
* @param \Magento\Catalog\Model\Product $product
* @param \Magento\Framework\Object $buyRequest
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function processBuyRequest($product, $buyRequest)
{
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
index d3a56cdde9f..d8ce60e66a4 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/AbstractBackend.php
@@ -245,6 +245,7 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
*
* @param \Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterLoad($object)
{
@@ -272,6 +273,7 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
*
* @param \Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterSave($object)
{
@@ -283,6 +285,7 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
*
* @param \Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function beforeDelete($object)
{
@@ -294,6 +297,7 @@ abstract class AbstractBackend implements \Magento\Eav\Model\Entity\Attribute\Ba
*
* @param \Magento\Framework\Object $object
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterDelete($object)
{
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index eeb33441e6c..e6f7477b4dd 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -425,6 +425,7 @@ abstract class AbstractMethod extends \Magento\Framework\Object implements Metho
*
* @param string $currencyCode
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function canUseForCurrency($currencyCode)
{
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index 0499e74c01b..9b8065dc1c5 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -307,6 +307,7 @@ class Transaction extends AbstractExtensibleModel implements TransactionInterfac
* @return Transaction[]
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getChildTransactions($types = null, $txnId = null, $recursive = false)
{
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
index b0411cc1c13..521e520a4e7 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Track.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
@@ -22,6 +22,7 @@ use Magento\Sales\Model\AbstractModel;
* @method \Magento\Sales\Model\Order\Shipment\Track setUpdatedAt(string $value)
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Track extends AbstractModel implements ShipmentTrackInterface
{
diff --git a/app/code/Magento/Sales/Model/Quote/Payment.php b/app/code/Magento/Sales/Model/Quote/Payment.php
index b72731e717c..a0eaa8cb840 100644
--- a/app/code/Magento/Sales/Model/Quote/Payment.php
+++ b/app/code/Magento/Sales/Model/Quote/Payment.php
@@ -41,6 +41,7 @@ use Magento\Framework\Api\AttributeDataBuilder;
* @method \Magento\Sales\Model\Quote\Payment setCcSsIssue(string $value)
*
* @author Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Payment extends \Magento\Payment\Model\Info
{
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index e6c651a302e..f5ec3999aae 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -165,6 +165,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @param Request $request
* @return \Magento\Framework\Object
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function requestToShipment($request)
{
@@ -177,6 +178,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @param Request $request
* @return \Magento\Framework\Object
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function returnOfShipment($request)
{
@@ -188,6 +190,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @param \Magento\Framework\Object|null $params
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getContainerTypes(\Magento\Framework\Object $params = null)
{
@@ -264,6 +267,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @param \Magento\Framework\Object|null $params
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getDeliveryConfirmationTypes(\Magento\Framework\Object $params = null)
{
@@ -320,6 +324,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @param \Magento\Sales\Model\Quote\Address\RateRequest $request
* @return $this|bool|Error
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function proccessAdditionalValidation(\Magento\Sales\Model\Quote\Address\RateRequest $request)
{
@@ -562,6 +567,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @param string|null $countryId
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function isZipCodeRequired($countryId = null)
{
@@ -618,6 +624,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
*
* @param \Magento\Framework\Object $params
* @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getContentTypes(\Magento\Framework\Object $params)
{
diff --git a/app/code/Magento/Store/Model/Storage/Db.php b/app/code/Magento/Store/Model/Storage/Db.php
index feaeb575483..43d7ecaf7ea 100644
--- a/app/code/Magento/Store/Model/Storage/Db.php
+++ b/app/code/Magento/Store/Model/Storage/Db.php
@@ -440,6 +440,7 @@ class Db implements \Magento\Store\Model\StoreManagerInterface
* @param bool $withDefault
* @param bool $codeKey
* @return Group[]
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getGroups($withDefault = false, $codeKey = false)
{
diff --git a/app/code/Magento/Ui/Component/Form.php b/app/code/Magento/Ui/Component/Form.php
index 956bc06a045..2f23ac5d24a 100644
--- a/app/code/Magento/Ui/Component/Form.php
+++ b/app/code/Magento/Ui/Component/Form.php
@@ -18,6 +18,7 @@ use Magento\Ui\DataProvider\Manager;
/**
* Class Form
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Form extends AbstractView
{
diff --git a/app/code/Magento/Ui/Component/Layout/AbstractStructure.php b/app/code/Magento/Ui/Component/Layout/AbstractStructure.php
index be4d9ba4f35..9d71dc7a943 100644
--- a/app/code/Magento/Ui/Component/Layout/AbstractStructure.php
+++ b/app/code/Magento/Ui/Component/Layout/AbstractStructure.php
@@ -19,6 +19,7 @@ use Magento\Ui\DataProvider\Metadata;
/**
* Class AbstractStructure
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class AbstractStructure extends AbstractView
{
diff --git a/app/code/Magento/Ui/Component/Listing.php b/app/code/Magento/Ui/Component/Listing.php
index 774d15ef1c5..3e51a2debd9 100644
--- a/app/code/Magento/Ui/Component/Listing.php
+++ b/app/code/Magento/Ui/Component/Listing.php
@@ -17,6 +17,7 @@ use Magento\Ui\DataProvider\Manager;
/**
* Class Listing
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Listing extends AbstractView
{
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
index e35fbb77d47..d8e5d5b3252 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
@@ -11,6 +11,9 @@ use Magento\Tax\Api\Data\TaxRateInterface;
use Magento\Tax\Model\TaxRuleFixtureFactory;
use Magento\TestFramework\Helper\Bootstrap;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class RateRepositoryTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
index c87b9bf2a29..64cabacc123 100644
--- a/lib/internal/Magento/Framework/DB/Tree.php
+++ b/lib/internal/Magento/Framework/DB/Tree.php
@@ -15,6 +15,9 @@ use Magento\Framework\DB\Tree\TreeException;
* Magento Library
*/
require_once 'Tree/TreeException.php';
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Tree
{
/**
diff --git a/lib/internal/Magento/Framework/Event/Observer/Cron.php b/lib/internal/Magento/Framework/Event/Observer/Cron.php
index 755b758d939..5b04ea85088 100644
--- a/lib/internal/Magento/Framework/Event/Observer/Cron.php
+++ b/lib/internal/Magento/Framework/Event/Observer/Cron.php
@@ -19,6 +19,7 @@ class Cron extends \Magento\Framework\Event\Observer
*
* @param \Magento\Framework\Event $event
* @return boolean
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function isValidFor(\Magento\Framework\Event $event)
{
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
index a02d624ba25..a2f110beea8 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
@@ -123,6 +123,7 @@ class Http extends File
* @param string $mode
* @return resource file
* @throws FilesystemException
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function fileOpen($path, $mode)
{
@@ -202,6 +203,7 @@ class Http extends File
* @param string $path
* @param string|null $scheme
* @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getAbsolutePath($basePath, $path, $scheme = null)
{
diff --git a/lib/internal/Magento/Framework/HTTP/Client/Socket.php b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
index ed837b4cdbb..ba96471a987 100644
--- a/lib/internal/Magento/Framework/HTTP/Client/Socket.php
+++ b/lib/internal/Magento/Framework/HTTP/Client/Socket.php
@@ -523,6 +523,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
*
* @param array $arr
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setOptions($arr)
{
@@ -535,6 +536,7 @@ class Socket implements \Magento\Framework\HTTP\ClientInterface
* @param string $name
* @param string $value
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function setOption($name, $value)
{
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 083b8c3cf77..08ad29e8174 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -18,6 +18,9 @@ use Magento\Framework\ObjectManager\DefinitionInterface as ClassDefinitions;
use Magento\Framework\ObjectManagerInterface;
use Zend\Soap\Exception\InvalidArgumentException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class PluginList extends Scoped implements InterceptionPluginList
{
/**
diff --git a/lib/internal/Magento/Framework/Translate/Inline.php b/lib/internal/Magento/Framework/Translate/Inline.php
index c3cbbc129a8..28c6e25275f 100644
--- a/lib/internal/Magento/Framework/Translate/Inline.php
+++ b/lib/internal/Magento/Framework/Translate/Inline.php
@@ -168,6 +168,7 @@ class Inline implements \Magento\Framework\Translate\InlineInterface
*
* @param mixed|string|null $tagName
* @return null
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getAdditionalHtmlAttribute($tagName = null)
{
--
GitLab
From d6599759b00d95885585118e0810b4a290012756 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Thu, 15 Jan 2015 11:25:19 +0200
Subject: [PATCH 063/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- Fixes for L3 fails
---
...ulationAfterCheckoutDownloadableExcludingIncludingTax.php | 4 ++--
...rtTaxCalculationAfterCheckoutDownloadableExcludingTax.php | 4 ++--
...rtTaxCalculationAfterCheckoutDownloadableIncludingTax.php | 4 ++--
...IsAppliedToAllPricesDownloadableExcludingIncludingTax.php | 4 ++--
...rtTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php | 4 ++--
...rtTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php | 4 ++--
.../Test/Repository/DownloadableProductInjectable.php | 1 +
.../tests/app/Magento/Sales/Test/Block/Order/View.php | 2 ++
...ssertTaxCalculationAfterCheckoutExcludingIncludingTax.php | 4 ++--
.../AssertTaxCalculationAfterCheckoutExcludingTax.php | 3 +--
.../AssertTaxCalculationAfterCheckoutIncludingTax.php | 3 +--
...ssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php | 5 +++--
12 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
index 1132a5eba4d..64896843ae6 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
/**
* Checks that prices excl and incl tax on order review and customer order pages are equal to specified in dataset.
*/
-class AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax
- extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+class AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax extends
+ AbstractAssertTaxCalculationAfterCheckoutDownloadable
{
/**
* Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
index f2674893728..60a4e36293d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php
@@ -11,8 +11,8 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
/**
* Checks that prices excl tax on order review and customer order pages are equal to specified in dataset.
*/
-class AssertTaxCalculationAfterCheckoutDownloadableExcludingTax
- extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+class AssertTaxCalculationAfterCheckoutDownloadableExcludingTax extends
+ AbstractAssertTaxCalculationAfterCheckoutDownloadable
{
/**
* Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
index 88ee73b5067..653b30217db 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
/**
* Checks that prices incl tax on order review and customer order pages are equal to specified in dataset.
*/
-class AssertTaxCalculationAfterCheckoutDownloadableIncludingTax
- extends AbstractAssertTaxCalculationAfterCheckoutDownloadable
+class AssertTaxCalculationAfterCheckoutDownloadableIncludingTax extends
+ AbstractAssertTaxCalculationAfterCheckoutDownloadable
{
/**
* Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
index a19281b101d..2ea9f0bc5bd 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
/**
* Checks that prices excl tax on category, product and cart pages are equal to specified in dataset.
*/
-class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax
- extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax extends
+ AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
{
/**
* Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
index a48b94174bc..eaa5d5e115f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
/**
* Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset.
*/
-class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax
- extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax extends
+ AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
{
/**
* Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
index 61a282eda03..31fc3a1154b 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Downloadable\Test\Constraint;
/**
* Checks that prices incl tax on category, product and cart pages are equal to specified in dataset.
*/
-class AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax
- extends AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
+class AssertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax extends
+ AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable
{
/**
* Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
index 156d1c2348c..240e3b2b1b2 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
@@ -21,6 +21,7 @@ class DownloadableProductInjectable extends AbstractRepository
* @param array $defaultData [optional]
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function __construct(array $defaultConfig = [], array $defaultData = [])
{
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
index f318d074c46..8e732491a44 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
@@ -12,6 +12,8 @@ use Mtf\Client\Element\Locator;
/**
* Class View
* View block on order's view page
+ *
+ * @SuppressWarnings(PHPMD.TooManyFields)
*/
class View extends Block
{
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
index e4219643ae8..7d65c80e0ae 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingIncludingTax.php
@@ -9,8 +9,8 @@ namespace Magento\Tax\Test\Constraint;
/**
* Checks that prices excl and incl tax on order review and customer order pages are equal to specified in dataset.
*/
-class AssertTaxCalculationAfterCheckoutExcludingIncludingTax
- extends AbstractAssertTaxCalculationAfterCheckout
+class AssertTaxCalculationAfterCheckoutExcludingIncludingTax extends
+ AbstractAssertTaxCalculationAfterCheckout
{
/**
* Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
index e925881d8ad..eecf9cc8c87 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutExcludingTax.php
@@ -8,8 +8,7 @@ namespace Magento\Tax\Test\Constraint;
/**
* Checks that prices including tax on order review and customer order pages are equal to specified in dataset.
*/
-class AssertTaxCalculationAfterCheckoutExcludingTax extends
- AbstractAssertTaxCalculationAfterCheckout
+class AssertTaxCalculationAfterCheckoutExcludingTax extends AbstractAssertTaxCalculationAfterCheckout
{
/**
* Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
index e7079263b0e..59869e99eaa 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxCalculationAfterCheckoutIncludingTax.php
@@ -9,8 +9,7 @@ namespace Magento\Tax\Test\Constraint;
/**
* Checks that prices including tax on order review and customer order pages are equal to specified in dataset.
*/
-class AssertTaxCalculationAfterCheckoutIncludingTax extends
- AbstractAssertTaxCalculationAfterCheckout
+class AssertTaxCalculationAfterCheckoutIncludingTax extends AbstractAssertTaxCalculationAfterCheckout
{
/**
* Constraint severeness.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
index 55ea81d13ce..b685b18e960 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax.php
@@ -7,11 +7,12 @@
namespace Magento\Tax\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+
/**
* Checks that prices excl and incl tax on category, product and cart pages are equal to specified in dataset
*/
-class AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax
- extends AbstractAssertTaxRuleIsAppliedToAllPrices
+class AssertTaxRuleIsAppliedToAllPricesExcludingIncludingTax extends
+ AbstractAssertTaxRuleIsAppliedToAllPrices
{
/**
* Constraint severeness.
--
GitLab
From 845f627243a88035396623c51c56861dd73d9d90 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Thu, 15 Jan 2015 14:23:46 +0200
Subject: [PATCH 064/120] MAGETWO-32592: MTF Alternative Web Driver pull
request preparation
---
.../Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php | 2 +-
.../Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php | 2 +-
.../Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 08022e2638b..c7e342e81c5 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -93,7 +93,7 @@ class Option extends Form
$this->_fill($mapping);
$selections = $this->_rootElement->getElements($this->removeSelection);
if (count($selections)) {
- foreach ($selections as $itemSelection) {
+ foreach (array_reverse($selections) as $itemSelection) {
$itemSelection->click();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
index 27dacb30516..a449ffbd476 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
@@ -200,7 +200,7 @@ class Config extends Tab
{
$attributeElements = $this->_rootElement->getElements($this->attributeElement);
$this->_rootElement->find($this->variationsContent)->click();
- foreach ($attributeElements as $element) {
+ foreach (array_reverse($attributeElements) as $element) {
$element->find($this->deleteVariationButton)->click();
}
}
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
index 597a596626d..275601b0631 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
@@ -83,7 +83,7 @@ class AssociatedProducts extends Tab
if (isset($fields['associated'])) {
$options = $this->_rootElement->getElements($this->deleteButton);
if (count($options)) {
- foreach ($options as $option) {
+ foreach (array_reverse($options) as $option) {
$option->click();
}
}
--
GitLab
From 2b8ab4657466bff4b6e83eb8ca4bbef45b37e53b Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 15 Jan 2015 18:17:37 +0200
Subject: [PATCH 065/120] MAGETWO-31363: Unit and Integration tests coverage
---
.../Model/SalesRule/CalculatorTest.php | 154 ++++++++++++++++--
1 file changed, 141 insertions(+), 13 deletions(-)
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
index b70631f2e42..b8e7b265792 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
@@ -5,35 +5,163 @@
*/
namespace Magento\OfflineShipping\Model\SalesRule;
+class CalculatorForTest extends Calculator
+{
+ public function setValidatorUtility($validatorUtility)
+ {
+ $this->validatorUtility = $validatorUtility;
+ }
+}
+
class CalculatorTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\SalesRule\Model\Validator|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\OfflineShipping\Model\SalesRule\CalculatorForTest|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_model;
+ /**
+ * @var \Magento\Sales\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $itemMock;
+
+ /**
+ * @var \Magento\SalesRule\Model\Utility|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $utilityMock;
+
+ /**
+ * @var \Magento\SalesRule\Model\Rule|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $ruleMock;
+
+ /**
+ * @var \Magento\Sales\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $addressMock;
+
protected function setUp()
{
- $this->_model = $this->getMock(
- 'Magento\OfflineShipping\Model\SalesRule\Calculator',
- ['_getRules', '__wakeup'],
- [],
- '',
- false
- );
- $this->_model->expects($this->any())->method('_getRules')->will($this->returnValue([]));
+ $this->utilityMock = $this->getMockBuilder('Magento\SalesRule\Model\Utility')
+ ->disableOriginalConstructor()
+ ->setMethods(['canProcessRule'])
+ ->getMock();
+
+ $this->_model = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\CalculatorForTest')
+ ->disableOriginalConstructor()
+ ->setMethods(['_getRules', '__wakeup'])
+ ->getMock();
+
+ $this->ruleMock = $this->getMockBuilder('Magento\SalesRule\Model\Rule')
+ ->disableOriginalConstructor()
+ ->setMethods(['getActions', 'getSimpleFreeShipping'])
+ ->getMock();
+
+ $this->addressMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address')
+ ->disableOriginalConstructor()
+ ->setMethods(['setFreeShipping'])
+ ->getMock();
+
+ $this->_model->setValidatorUtility($this->utilityMock);
+
+ $this->itemMock = $this->getMock('Magento\Sales\Model\Quote\Item', ['getAddress'], [], '', false);
+
+ $this->itemMock->expects($this->once())
+ ->method('getAddress')
+ ->willReturn($this->addressMock);
}
public function testProcessFreeShipping()
{
- $item = $this->getMock('Magento\Sales\Model\Quote\Item', ['getAddress', '__wakeup'], [], '', false);
- $item->expects($this->once())->method('getAddress')->will($this->returnValue(true));
+ $this->_model->expects($this->any())->method('_getRules')->will($this->returnValue([]));
$this->assertInstanceOf(
'Magento\OfflineShipping\Model\SalesRule\Calculator',
- $this->_model->processFreeShipping($item)
+ $this->_model->processFreeShipping($this->itemMock)
);
+ }
+
+ public function testProcessFreeShippingContinueOnProcessRule()
+ {
+ $this->_model->expects($this->once())
+ ->method('_getRules')
+ ->willReturn(['rule1']);
+
+ $this->utilityMock->expects($this->once())
+ ->method('canProcessRule')
+ ->willReturn(false);
+
+ $this->_model->processFreeShipping($this->itemMock);
+ }
+
+ public function testProcessFreeShippingContinueOnValidateItem()
+ {
+ $this->utilityMock->expects($this->once())
+ ->method('canProcessRule')
+ ->willReturn(true);
+
+ $actionsCollectionMock = $this->getMockBuilder('Magento\Rule\Model\Action\Collection')
+ ->disableOriginalConstructor()
+ ->setMethods(['validate'])
+ ->getMock();
+
+ $actionsCollectionMock->expects($this->once())
+ ->method('validate')
+ ->willReturn(false);
+
+ $this->ruleMock->expects($this->once())
+ ->method('getActions')
+ ->willReturn($actionsCollectionMock);
+
+ $this->_model->expects($this->once())
+ ->method('_getRules')
+ ->willReturn([$this->ruleMock]);
+
+ $this->_model->processFreeShipping($this->itemMock);
+ }
- return true;
+ /**
+ * @dataProvider rulesDataProvider
+ */
+ public function testProcessFreeShippingFreeShippingItem($rule)
+ {
+ $this->utilityMock->expects($this->once())
+ ->method('canProcessRule')
+ ->willReturn(true);
+
+ $actionsCollectionMock = $this->getMockBuilder('Magento\Rule\Model\Action\Collection')
+ ->disableOriginalConstructor()
+ ->setMethods(['validate'])
+ ->getMock();
+
+ $actionsCollectionMock->expects($this->once())
+ ->method('validate')
+ ->willReturn(true);
+
+ $this->ruleMock->expects($this->once())
+ ->method('getActions')
+ ->willReturn($actionsCollectionMock);
+
+ $this->_model->expects($this->once())
+ ->method('_getRules')
+ ->willReturn([$this->ruleMock]);
+
+ $this->ruleMock->expects($this->once())
+ ->method('getSimpleFreeShipping')
+ ->willReturn($rule);
+
+ $this->addressMock->expects(
+ $rule == \Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ADDRESS ? $this->once() : $this->never()
+ )->method('setFreeShipping');
+
+ $this->_model->processFreeShipping($this->itemMock);
+ }
+
+ public function rulesDataProvider()
+ {
+ return [
+ [\Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ITEM],
+ [\Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ADDRESS]
+ ];
}
}
--
GitLab
From ad849eb9601229aeaab1a409ba0c03de8e9f254f Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 15 Jan 2015 20:01:31 +0200
Subject: [PATCH 066/120] MAGETWO-31363: Unit and Integration tests coverage
---
.../Model/Quote/FreeshippingTest.php | 133 ++++++++++++++++++
1 file changed, 133 insertions(+)
create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
new file mode 100644
index 00000000000..f422800d159
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Quote;
+
+class FreeshippingTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflineShipping\Model\Quote\Freeshipping|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\Sales\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $addressMock;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $storeManagerMock;
+
+ /**
+ * @var \Magento\OfflineShipping\Model\SalesRule\Calculator|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $calculatorMock;
+
+ protected function setUp()
+ {
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->addressMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address')
+ ->disableOriginalConstructor()
+ ->setMethods([
+ 'getQuote',
+ 'getAllItems',
+ 'getFreeShipping'
+ ])
+ ->getMock();
+
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->calculatorMock = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\Calculator')
+ ->disableOriginalConstructor()
+ //->setMethods(['init'])
+ ->getMock();
+
+ $this->model = $helper->getObject('Magento\OfflineShipping\Model\Quote\Freeshipping', [
+ 'storeManager' => $this->storeManagerMock,
+ 'calculator' => $this->calculatorMock
+ ]);
+ }
+
+
+ public function testCollectWithEmptyAddressItems()
+ {
+ $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->addressMock->expects($this->once())
+ ->method('getQuote')
+ ->willReturn($quoteMock);
+
+ $this->addressMock->expects($this->once())
+ ->method('getAllItems')
+ ->willReturn([]);
+
+ $this->assertSame($this->model->collect($this->addressMock), $this->model);
+ }
+
+ /**
+ * @dataProvider scenariosDataProvider
+ */
+ public function testCollectWithAddressItems(
+ $addressItemMockNoDiscountValue,
+ $addressMockGetFreeShippingExpects
+ ) {
+ $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->addressMock->expects($this->any())
+ ->method('getQuote')
+ ->willReturn($quoteMock);
+
+ $addressItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address\Item')
+ ->disableOriginalConstructor()
+ ->setMethods(['getNoDiscount', 'getFreeShipping'])
+ ->getMock();
+
+ $addressItemMock->expects($this->once())
+ ->method('getNoDiscount')
+ ->willReturn($addressItemMockNoDiscountValue);
+
+ $addressItemMock->expects($this->any())
+ ->method('getFreeShipping')
+ ->willReturn(true);
+
+ $this->addressMock->expects($addressMockGetFreeShippingExpects)
+ ->method('getFreeShipping')
+ ->willReturn(false);
+
+ $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->storeManagerMock->expects($this->once())
+ ->method('getStore')
+ ->willReturn($storeMock);
+
+ $this->calculatorMock->expects($this->once())
+ ->method('init');
+
+ $this->addressMock->expects($this->once())
+ ->method('getAllItems')
+ ->willReturn([$addressItemMock]);
+
+ $this->model->collect($this->addressMock);
+ }
+
+ public function scenariosDataProvider()
+ {
+ return [
+ [true, $this->never()],
+ [false, $this->once()]
+ ];
+ }
+}
--
GitLab
From 42dfc8b4386f5a73424d3df9ce9f9395eccb1a7b Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Thu, 15 Jan 2015 20:27:07 -0600
Subject: [PATCH 067/120] MAGETWO-29705: Fixed confusing Filesystem Read/Write
Interfaces
---
app/code/Magento/Backup/Model/Backup.php | 6 +--
.../Magento/Downloadable/Helper/Download.php | 2 +-
.../Downloadable/Helper/DownloadTest.php | 2 +-
.../App/View/Asset/PublisherTest.php | 5 +-
.../Filesystem/Directory/ReadTest.php | 30 +----------
.../Filesystem/File/ReadFactoryTest.php | 46 +++++-----------
.../Filesystem/File/WriteFactoryTest.php | 54 ++++++-------------
lib/internal/Magento/Framework/Filesystem.php | 10 ++--
.../Framework/Filesystem/Directory/Read.php | 17 ++----
.../Filesystem/Directory/ReadFactory.php | 6 +--
.../Framework/Filesystem/Directory/Write.php | 10 ++--
.../Filesystem/Directory/WriteFactory.php | 6 +--
.../Filesystem/Directory/WriteInterface.php | 3 +-
.../Framework/Filesystem/File/ReadFactory.php | 23 ++++----
.../Filesystem/File/WriteFactory.php | 24 +++++----
15 files changed, 88 insertions(+), 156 deletions(-)
diff --git a/app/code/Magento/Backup/Model/Backup.php b/app/code/Magento/Backup/Model/Backup.php
index e5ac0102187..52f720fea22 100644
--- a/app/code/Magento/Backup/Model/Backup.php
+++ b/app/code/Magento/Backup/Model/Backup.php
@@ -6,6 +6,7 @@
namespace Magento\Backup\Model;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
/**
* Backup file item model
@@ -292,11 +293,10 @@ class Backup extends \Magento\Framework\Object implements \Magento\Framework\Bac
try {
/** @var \Magento\Framework\Filesystem\Directory\WriteInterface $varDirectory */
- $varDirectory = $this->_filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+ $varDirectory = $this->_filesystem->getDirectoryWrite(DirectoryList::VAR_DIR, DriverPool::ZLIB);
$this->_stream = $varDirectory->openFile(
$this->_getFilePath(),
- $mode,
- \Magento\Framework\Filesystem\DriverPool::ZLIB
+ $mode
);
} catch (\Magento\Framework\Filesystem\FilesystemException $e) {
throw new \Magento\Framework\Backup\Exception\NotEnoughPermissions(
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index d54c436b781..a83b739b5f5 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -168,7 +168,7 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
// Strip down protocol from path
$path = preg_replace('#.+://#', '', $path);
}
- $this->_handle = $this->fileReadFactory->create($path, $protocol);
+ $this->_handle = $this->fileReadFactory->createWithDriverCode($path, $protocol);
} elseif ($this->_linkType == self::LINK_TYPE_FILE) {
$this->_workingDirectory = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);
$fileExists = $this->_downloadableFile->ensureFileInFilesystem($this->_resourceFile);
diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
index a80e3f57e3a..0165294a2fd 100644
--- a/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
+++ b/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
@@ -226,7 +226,7 @@ class DownloadTest extends \PHPUnit_Framework_TestCase
$this->fileReadFactory->expects(
$this->once()
)->method(
- 'create'
+ 'createWithDriverCode'
)->will(
$this->returnValue($this->_handleMock)
);
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php
index 4b3658be219..6d5c40ea63d 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/View/Asset/PublisherTest.php
@@ -7,6 +7,7 @@
namespace Magento\Framework\App\View\Asset;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
class PublisherTest extends \PHPUnit_Framework_TestCase
{
@@ -56,8 +57,8 @@ class PublisherTest extends \PHPUnit_Framework_TestCase
$this->filesystem->expects($this->any())
->method('getDirectoryWrite')
->will($this->returnValueMap([
- [DirectoryList::ROOT, $this->rootDirWrite],
- [DirectoryList::STATIC_VIEW, $this->staticDirWrite],
+ [DirectoryList::ROOT, DriverPool::FILE, $this->rootDirWrite],
+ [DirectoryList::STATIC_VIEW, DriverPool::FILE, $this->staticDirWrite],
]));
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
index b84c08e9a72..640724c6bb5 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
@@ -77,7 +77,7 @@ class ReadTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(['some-stat-data'], $this->read->stat('correct-path'));
}
- public function testReadFileNoProtocol()
+ public function testReadFile()
{
$path = 'filepath';
$flag = 'flag';
@@ -95,32 +95,4 @@ class ReadTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($contents, $this->read->readFile($path, $flag, $context));
}
-
- public function testReadFileCustomProtocol()
- {
- $path = 'filepath';
- $flag = 'flag';
- $context = 'context';
- $protocol = 'ftp';
- $contents = 'contents';
-
- $fileMock = $this->getMock('Magento\Framework\Filesystem\File\Read', [], [], '', false);
- $fileMock->expects($this->once())
- ->method('readAll')
- ->with($flag, $context)
- ->will($this->returnValue($contents));
-
- $this->driver->expects($this->once())
- ->method('getAbsolutePath')
- ->with($this->path, $path, $protocol)
- ->will($this->returnValue($path));
- $this->driver->expects($this->never())
- ->method('fileGetContents');
- $this->fileFactory->expects($this->once())
- ->method('create')
- ->with($path, $protocol, $this->driver)
- ->will($this->returnValue($fileMock));
-
- $this->assertEquals($contents, $this->read->readFile($path, $flag, $context, $protocol));
- }
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
index f41817b6cf3..ce7d66e4bac 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
@@ -12,45 +12,25 @@ use Magento\Framework\Filesystem\DriverPool;
*/
class ReadFactoryTest extends \PHPUnit_Framework_TestCase
{
- /**
- * @param string|null $protocol
- * @param \PHPUnit_Framework_MockObject_MockObject|null $driver
- * @dataProvider createProvider
- */
- public function testCreate($protocol, $driver)
+ public function testCreate()
{
$driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
- if ($protocol) {
- $driverMock = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
- $driverMock->expects($this->any())->method('isExists')->willReturn(true);
- $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
- } else {
- $driverPool->expects($this->never())->method('getDriver');
- }
- $factory = new ReadFactory($driverPool);
- $result = $factory->create('path', $protocol, $driver);
- $this->assertInstanceOf('Magento\Framework\Filesystem\File\Read', $result);
- }
-
- /**
- * @return array
- */
- public function createProvider()
- {
+ $driverPool->expects($this->never())->method('getDriver');
$driver = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
$driver->expects($this->any())->method('isExists')->willReturn(true);
- return [
- [null, $driver],
- ['custom_protocol', null]
- ];
+ $factory = new ReadFactory($driverPool);
+ $result = $factory->create('path', $driver);
+ $this->assertInstanceOf('Magento\Framework\Filesystem\File\Read', $result);
}
- /**
- * @expectedException \InvalidArgumentException
- */
- public function testCreateException()
+ public function testCreateWithDriverCode()
{
- $factory = new ReadFactory(new DriverPool());
- $factory->create('path');
+ $driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
+ $driverMock = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
+ $driverMock->expects($this->any())->method('isExists')->willReturn(true);
+ $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
+ $factory = new ReadFactory($driverPool);
+ $result = $factory->createWithDriverCode('path', 'driverCode');
+ $this->assertInstanceOf('Magento\Framework\Filesystem\File\Read', $result);
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
index 256dbf1a7c3..579cc9766ae 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
@@ -5,63 +5,41 @@
*/
namespace Magento\Framework\Filesystem\File;
-use Magento\Framework\Filesystem\DriverPool;
-
/**
* Class WriteFactoryTest
*/
class WriteFactoryTest extends \PHPUnit_Framework_TestCase
{
- /**
- * @param string|null $protocol
- * @param \PHPUnit_Framework_MockObject_MockObject|null $driver
- * @dataProvider createProvider
- */
- public function testCreate($protocol, $driver)
+ public function testCreate()
{
$driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
- if ($protocol) {
- $driverMock = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
- $driverMock->expects($this->any())->method('isExists')->willReturn(true);
- $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
- } else {
- $driverPool->expects($this->never())->method('getDriver');
- }
+ $driverPool->expects($this->never())->method('getDriver');
$factory = new WriteFactory($driverPool);
- $result = $factory->create('path', $protocol, $driver);
- $this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
- }
-
- /**
- * @return array
- */
- public function createProvider()
- {
$driver = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
$driver->expects($this->any())->method('isExists')->willReturn(true);
- return [
- [null, $driver],
- ['custom_protocol', null]
- ];
+ $result = $factory->create('path', $driver);
+ $this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
}
- /**
- * @expectedException \InvalidArgumentException
- */
- public function testCreateException()
+ public function testCreateWithDriverCode()
{
- $factory = new WriteFactory(new DriverPool());
- $factory->create('path');
+ $driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
+ $driverMock = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
+ $driverMock->expects($this->any())->method('isExists')->willReturn(true);
+ $driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
+ $factory = new WriteFactory($driverPool);
+ $result = $factory->createWithDriverCode('path', 'driverCode');
+ $this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
}
public function testCreateWithMode()
{
- $driver = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
- $driver->expects($this->any())->method('isExists')->willReturn(false);
$driverPool = $this->getMock('Magento\Framework\Filesystem\DriverPool', ['getDriver']);
- $driverPool->expects($this->once())->method('getDriver')->with('protocol')->willReturn($driver);
+ $driverPool->expects($this->never())->method('getDriver');
+ $driver = $this->getMockForAbstractClass('Magento\Framework\Filesystem\DriverInterface');
+ $driver->expects($this->any())->method('isExists')->willReturn(true);
$factory = new WriteFactory($driverPool);
- $result = $factory->create('path', 'protocol', null, 'a+');
+ $result = $factory->create('path', $driver, 'a+');
$this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
}
}
diff --git a/lib/internal/Magento/Framework/Filesystem.php b/lib/internal/Magento/Framework/Filesystem.php
index e55ea9d8b2d..9429da43b59 100644
--- a/lib/internal/Magento/Framework/Filesystem.php
+++ b/lib/internal/Magento/Framework/Filesystem.php
@@ -7,7 +7,7 @@
*/
namespace Magento\Framework;
-use Magento\Framework\Filesystem\File\ReadInterface;
+use Magento\Framework\Filesystem\DriverPool;
class Filesystem
{
@@ -68,14 +68,16 @@ class Filesystem
/**
* Create an instance of directory with read permissions
*
- * @param string $code
+ * @param string $directoryCode
+ * @param string $driverCode
* @return \Magento\Framework\Filesystem\Directory\WriteInterface
* @throws \Magento\Framework\Filesystem\FilesystemException
*/
- public function getDirectoryWrite($code)
+ public function getDirectoryWrite($directoryCode, $driverCode = DriverPool::FILE)
{
+ $code = $directoryCode . '_' . $driverCode;
if (!array_key_exists($code, $this->writeInstances)) {
- $this->writeInstances[$code] = $this->writeFactory->create($this->getDirPath($code));
+ $this->writeInstances[$code] = $this->writeFactory->create($this->getDirPath($directoryCode), $driverCode);
}
return $this->writeInstances[$code];
}
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
index 3d10c9741cd..33f09a43d32 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
@@ -181,15 +181,13 @@ class Read implements ReadInterface
* Open file in read mode
*
* @param string $path
- * @param string|null $protocol
*
* @return \Magento\Framework\Filesystem\File\ReadInterface
*/
- public function openFile($path, $protocol = null)
+ public function openFile($path)
{
return $this->fileFactory->create(
$this->driver->getAbsolutePath($this->path, $path),
- $protocol,
$this->driver
);
}
@@ -200,21 +198,14 @@ class Read implements ReadInterface
* @param string $path
* @param string|null $flag
* @param resource|null $context
- * @param string|null $protocol
* @return string
* @throws FilesystemException
*/
- public function readFile($path, $flag = null, $context = null, $protocol = null)
+ public function readFile($path, $flag = null, $context = null)
{
- $absolutePath = $this->driver->getAbsolutePath($this->path, $path, $protocol);
+ $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+ return $this->driver->fileGetContents($absolutePath, $flag, $context);
- if (is_null($protocol)) {
- return $this->driver->fileGetContents($absolutePath, $flag, $context);
- }
-
- /** @var \Magento\Framework\Filesystem\File\Read $fileReader */
- $fileReader = $this->fileFactory->create($absolutePath, $protocol, $this->driver);
- return $fileReader->readAll($flag, $context);
}
/**
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
index 423ed6166a3..e1a9b33ab7a 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
@@ -30,12 +30,12 @@ class ReadFactory
* Create a readable directory
*
* @param string $path
- * @param string $protocol
+ * @param string $driverCode
* @return ReadInterface
*/
- public function create($path, $protocol = DriverPool::FILE)
+ public function create($path, $driverCode = DriverPool::FILE)
{
- $driver = $this->driverPool->getDriver($protocol);
+ $driver = $this->driverPool->getDriver($driverCode);
$factory = new \Magento\Framework\Filesystem\File\ReadFactory($this->driverPool);
return new Read($factory, $driver, $path);
}
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
index 6657360dc2a..18ff07a750e 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
@@ -197,16 +197,15 @@ class Write extends Read implements WriteInterface
*
* @param string $path
* @param string $mode
- * @param string|null $protocol
* @return \Magento\Framework\Filesystem\File\WriteInterface
*/
- public function openFile($path, $mode = 'w', $protocol = null)
+ public function openFile($path, $mode = 'w')
{
$folder = dirname($path);
$this->create($folder);
$this->assertWritable($folder);
$absolutePath = $this->driver->getAbsolutePath($this->path, $path);
- return $this->fileFactory->create($absolutePath, $protocol, $this->driver, $mode);
+ return $this->fileFactory->create($absolutePath, $this->driver, $mode);
}
/**
@@ -215,13 +214,12 @@ class Write extends Read implements WriteInterface
* @param string $path
* @param string $content
* @param string|null $mode
- * @param string|null $protocol
* @return int The number of bytes that were written.
* @throws FilesystemException
*/
- public function writeFile($path, $content, $mode = 'w+', $protocol = null)
+ public function writeFile($path, $content, $mode = 'w+')
{
- return $this->openFile($path, $mode, $protocol)->write($content);
+ return $this->openFile($path, $mode)->write($content);
}
/**
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
index 4585629cd98..809d86bb20b 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
@@ -30,13 +30,13 @@ class WriteFactory
* Create a readable directory
*
* @param string $path
- * @param string $protocol
+ * @param string $driverCode
* @param int $createPermissions
* @return \Magento\Framework\Filesystem\Directory\Write
*/
- public function create($path, $protocol = DriverPool::FILE, $createPermissions = null)
+ public function create($path, $driverCode = DriverPool::FILE, $createPermissions = null)
{
- $driver = $this->driverPool->getDriver($protocol);
+ $driver = $this->driverPool->getDriver($driverCode);
$factory = new \Magento\Framework\Filesystem\File\WriteFactory($this->driverPool);
return new Write($factory, $driver, $path, $createPermissions);
}
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
index df05fb18b13..ba46d247d48 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
@@ -80,10 +80,9 @@ interface WriteInterface extends ReadInterface
*
* @param string $path
* @param string $mode
- * @param string|null $protocol
* @return \Magento\Framework\Filesystem\File\WriteInterface
*/
- public function openFile($path, $mode = 'w', $protocol = null);
+ public function openFile($path, $mode = 'w');
/**
* Open file in given path
diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
index d142ee2a284..1dccce253ac 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
@@ -31,18 +31,23 @@ class ReadFactory
* Create a readable file
*
* @param string $path
- * @param string|null $protocol [optional]
- * @param DriverInterface $driver [optional]
+ * @param DriverInterface $driver
* @return \Magento\Framework\Filesystem\File\ReadInterface
- * @throws \InvalidArgumentException
*/
- public function create($path, $protocol = null, DriverInterface $driver = null)
+ public function create($path, DriverInterface $driver = null)
{
- if ($protocol) {
- $driver = $this->driverPool->getDriver($protocol);
- } elseif (!$driver) {
- throw new \InvalidArgumentException('Either driver or protocol must be specified.');
- }
return new Read($path, $driver);
}
+
+ /**
+ * Create a readable file
+ *
+ * @param string $path
+ * @param string|null $driverCode
+ * @return \Magento\Framework\Filesystem\File\ReadInterface
+ */
+ public function createWithDriverCode($path, $driverCode)
+ {
+ return new Read($path, $this->driverPool->getDriver($driverCode));
+ }
}
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
index 95a764a0e41..1a309eb0274 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
@@ -31,19 +31,25 @@ class WriteFactory
* Create a readable file.
*
* @param string $path
- * @param string|null $protocol [optional]
- * @param DriverInterface $driver [optional]
+ * @param DriverInterface $driver
* @param string $mode [optional]
* @return Write
- * @throws \InvalidArgumentException
*/
- public function create($path, $protocol = null, DriverInterface $driver = null, $mode = 'r')
+ public function create($path, DriverInterface $driver, $mode = 'r')
{
- if ($protocol) {
- $driver = $this->driverPool->getDriver($protocol);
- } elseif (!$driver) {
- throw new \InvalidArgumentException('Either driver or protocol must be specified.');
- }
return new Write($path, $driver, $mode);
}
+
+ /**
+ * Create a readable file.
+ *
+ * @param string $path
+ * @param string $driverCode
+ * @param string $mode [optional]
+ * @return Write
+ */
+ public function createWithDriverCode($path, $driverCode, $mode = 'r')
+ {
+ return new Write($path, $this->driverPool->getDriver($driverCode), $mode);
+ }
}
--
GitLab
From 79cf87eba2d591bbeeb334e6abd2c69c05872dbb Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 16 Jan 2015 13:11:14 +0200
Subject: [PATCH 068/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- added copyright
---
.../TestFramework/CodingStandard/Tool/BlacklistInterface.php | 4 ++--
.../TestFramework/CodingStandard/Tool/ExtensionInterface.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php
index ee20c1e1196..a87c8afb812 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/BlacklistInterface.php
@@ -1,7 +1,7 @@
<?php
/**
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
// @codingStandardsIgnoreFile
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/ExtensionInterface.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/ExtensionInterface.php
index 08b405ab3d7..8d8f8e966f2 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/ExtensionInterface.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/ExtensionInterface.php
@@ -1,7 +1,7 @@
<?php
/**
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\TestFramework\CodingStandard\Tool;
--
GitLab
From 1de6a4227e5ddc8d248ef35e67978c7c595a7f40 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 14:30:42 +0200
Subject: [PATCH 069/120] MAGETWO-31363: Unit and Integration tests coverage
---
.../Model/Quote/FreeshippingTest.php | 95 ++++++++++++++-----
1 file changed, 70 insertions(+), 25 deletions(-)
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
index f422800d159..2259ed7829d 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
@@ -36,7 +36,8 @@ class FreeshippingTest extends \PHPUnit_Framework_TestCase
->setMethods([
'getQuote',
'getAllItems',
- 'getFreeShipping'
+ 'getFreeShipping',
+ 'setFreeShipping'
])
->getMock();
@@ -44,9 +45,17 @@ class FreeshippingTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
+ $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->storeManagerMock->expects($this->once())
+ ->method('getStore')
+ ->willReturn($storeMock);
+
$this->calculatorMock = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\Calculator')
->disableOriginalConstructor()
- //->setMethods(['init'])
+ ->setMethods(['init', 'processFreeShipping'])
->getMock();
$this->model = $helper->getObject('Magento\OfflineShipping\Model\Quote\Freeshipping', [
@@ -75,59 +84,95 @@ class FreeshippingTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider scenariosDataProvider
+ * @param $isNoDiscount
*/
- public function testCollectWithAddressItems(
- $addressItemMockNoDiscountValue,
- $addressMockGetFreeShippingExpects
- ) {
+ public function testCollectWithAddressItems($isNoDiscount)
+ {
$quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
->disableOriginalConstructor()
->getMock();
- $this->addressMock->expects($this->any())
+ $this->addressMock->expects($this->once())
->method('getQuote')
->willReturn($quoteMock);
$addressItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address\Item')
->disableOriginalConstructor()
- ->setMethods(['getNoDiscount', 'getFreeShipping'])
+ ->setMethods([
+ 'getNoDiscount',
+ 'setFreeShipping',
+ 'getParentItemId',
+ 'getFreeShipping',
+ 'getHasChildren',
+ 'isChildrenCalculated',
+ 'getChildren'
+ ])
->getMock();
+ $this->addressMock->expects($this->once())
+ ->method('getAllItems')
+ ->willReturn([$addressItemMock]);
+
+ $this->calculatorMock->expects($this->once())
+ ->method('init');
+
$addressItemMock->expects($this->once())
->method('getNoDiscount')
- ->willReturn($addressItemMockNoDiscountValue);
+ ->willReturn($isNoDiscount);
- $addressItemMock->expects($this->any())
+ $addressItemMock->expects($isNoDiscount ? $this->once() : $this->never())
+ ->method('setFreeShipping');
+
+ $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
+ ->method('getParentItemId')
+ ->willReturn(false);
+
+ $this->calculatorMock->expects($isNoDiscount ? $this->never() : $this->exactly(2))
+ ->method('processFreeShipping');
+
+ $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
->method('getFreeShipping')
->willReturn(true);
- $this->addressMock->expects($addressMockGetFreeShippingExpects)
- ->method('getFreeShipping')
- ->willReturn(false);
+ $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
+ ->method('getHasChildren')
+ ->willReturn(true);
- $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+ $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
+ ->method('isChildrenCalculated')
+ ->willReturn(true);
+
+ $childMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item\AbstractItem')
->disableOriginalConstructor()
+ ->setMethods(['setFreeShipping', 'getQuote', 'getAddress', 'getOptionByCode'])
->getMock();
- $this->storeManagerMock->expects($this->once())
- ->method('getStore')
- ->willReturn($storeMock);
+ $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
+ ->method('getChildren')
+ ->willReturn([$childMock]);
- $this->calculatorMock->expects($this->once())
- ->method('init');
+ $childMock->expects($isNoDiscount ? $this->never() : $this->once())
+ ->method('setFreeShipping');
- $this->addressMock->expects($this->once())
- ->method('getAllItems')
- ->willReturn([$addressItemMock]);
+ $this->addressMock->expects($isNoDiscount ? $this->never() : $this->once())
+ ->method('getFreeShipping')
+ ->willReturn(false);
- $this->model->collect($this->addressMock);
+ $this->addressMock->expects($isNoDiscount ? $this->once() : $this->exactly(2))
+ ->method('setFreeShipping');
+
+ $this->assertSame($this->model->collect($this->addressMock), $this->model);
}
public function scenariosDataProvider()
{
return [
- [true, $this->never()],
- [false, $this->once()]
+ [
+ true, // there is no a discount
+ ],
+ [
+ false, // there is a discount
+ ]
];
}
}
--
GitLab
From 73e34b8d3ce07123d4ffabfdbe5b254c38416159 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 16:01:22 +0200
Subject: [PATCH 070/120] MAGETWO-31363: Unit and Integration tests coverage
---
.../Checkout/Block/Cart/ShippingTest.php | 74 +++++++++++++++++++
1 file changed, 74 insertions(+)
create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
new file mode 100644
index 00000000000..21bdf26edee
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\SalesRule;
+
+class ShippingTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflineShipping\Model\Plugin\Checkout\Block\Cart\Shipping
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $scopeConfigMock;
+
+ protected function setUp()
+ {
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->scopeConfigMock = $this->getMockBuilder('\Magento\Framework\App\Config\ScopeConfigInterface')
+ ->disableOriginalConstructor()
+ ->setMethods([
+ 'getValue',
+ 'isSetFlag'
+ ])
+ ->getMock();
+
+ $this->model = $helper->getObject('\Magento\OfflineShipping\Model\Plugin\Checkout\Block\Cart\Shipping', [
+ 'scopeConfig' => $this->scopeConfigMock
+ ]);
+ }
+
+ /**
+ * @dataProvider afterGetStateActiveDataProvider
+ */
+ public function testAfterGetStateActive($scopeConfigMockReturnValue, $result, $assertResult)
+ {
+ /** @var \Magento\Checkout\Block\Cart\Shipping $subjectMock */
+ $subjectMock = $this->getMockBuilder('Magento\Checkout\Block\Cart\Shipping')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->scopeConfigMock->expects($result ? $this->never() : $this->once())
+ ->method('getValue')
+ ->willReturn($scopeConfigMockReturnValue);
+
+ $this->assertEquals($this->model->afterGetStateActive($subjectMock, $result), $assertResult);
+ }
+
+ public function afterGetStateActiveDataProvider()
+ {
+ return [
+ [
+ true,
+ true,
+ true
+ ],
+ [
+ true,
+ false,
+ true
+ ],
+ [
+ false,
+ false,
+ false
+ ]
+ ];
+ }
+}
--
GitLab
From dc9ee3266afd510499f2705b206b610dad395e8d Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Fri, 16 Jan 2015 16:22:23 +0200
Subject: [PATCH 071/120] MAGETWO-31966: Empty title for success placed order
page
---
.../view/frontend/layout/multishipping_checkout_success.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
index 5ea53255269..e9bca9477d8 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
@@ -7,6 +7,9 @@
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
<update handle="multishipping_checkout"/>
+ <head>
+ <title>Success Page</title>
+ </head>
<body>
<referenceBlock name="page.main.title">
<action method="setPageTitle">
--
GitLab
From 7609552e98d8725f104471655613bce55a1373c2 Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Fri, 16 Jan 2015 16:51:12 +0200
Subject: [PATCH 072/120] MAGETWO-31967: Exception page instead of 404 when
edit url for product with required configuration
---
.../Magento/Checkout/Controller/Cart/ConfigureTest.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
index 7548af64e81..4a49e870ac2 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -1,9 +1,7 @@
<?php
/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license {license_link}
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Checkout\Controller\Cart;
--
GitLab
From 1b9eb600a27f4f49c4f25982c0ef05516d7c7fe3 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 16:21:18 +0200
Subject: [PATCH 073/120] MAGETWO-31363: Unit and Integration tests coverage
---
.../Model/Config/Backend/TablerateTest.php | 50 +++++++++++++++++
.../Model/Config/Source/FlatrateTest.php | 30 +++++++++++
.../Observer/SalesRule/ActionsTabTest.php | 54 +++++++++++++++++++
.../Checkout/Block/Cart/ShippingTest.php | 2 +-
4 files changed, 135 insertions(+), 1 deletion(-)
create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/FlatrateTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
new file mode 100644
index 00000000000..869c408052d
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Config\Backend;
+
+class TablerateTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflineShipping\Model\Config\Backend\Tablerate
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $tableateFactoryMock;
+
+ protected function setUp()
+ {
+ $this->tableateFactoryMock = $this->getMockBuilder('Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->model = $helper->getObject('\Magento\OfflineShipping\Model\Config\Backend\Tablerate', [
+ 'tablerateFactory' => $this->tableateFactoryMock
+ ]);
+ }
+
+ public function testAfterSave()
+ {
+ $tablerateMock = $this->getMockBuilder('Magento\OfflineShipping\Model\Resource\Carrier\Tablerate')
+ ->disableOriginalConstructor()
+ ->setMethods(['uploadAndImport'])
+ ->getMock();
+
+ $this->tableateFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($tablerateMock);
+
+ $tablerateMock->expects($this->once())
+ ->method('uploadAndImport')
+ ->with($this->model);
+
+ $this->model->afterSave();
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/FlatrateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/FlatrateTest.php
new file mode 100644
index 00000000000..c133cd1e07d
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/FlatrateTest.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Config\Source;
+
+class FlatrateTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflineShipping\Model\Config\Source\Flatrate
+ */
+ protected $model;
+
+ protected function setUp()
+ {
+ $this->model = new Flatrate();
+ }
+
+ public function testToOptionArray()
+ {
+ $expected = [
+ ['value' => '', 'label' => __('None')],
+ ['value' => 'O', 'label' => __('Per Order')],
+ ['value' => 'I', 'label' => __('Per Item')]
+ ];
+
+ $this->assertEquals($expected, $this->model->toOptionArray());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
new file mode 100644
index 00000000000..f3ab5f5ca4f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Observer\SalesRule;
+
+class ActionsTabTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflineShipping\Model\Observer\SalesRule\ActionsTab
+ */
+ protected $model;
+
+ protected function setUp()
+ {
+ $this->model = new ActionsTab();
+ }
+
+ public function testPrepareForm()
+ {
+ $observerMock = $this->getMockBuilder('\Magento\Framework\Event\Observer')
+ ->disableOriginalConstructor()
+ ->setMethods(['getForm'])
+ ->getMock();
+
+ $formMock = $this->getMockBuilder('\Magento\Framework\Data\Form')
+ ->disableOriginalConstructor()
+ ->setMethods(['getElements'])
+ ->getMock();
+
+ $elementMock = $this->getMockBuilder('\Magento\Framework\Data\Form\Element\AbstractElement')
+ ->disableOriginalConstructor()
+ ->setMethods(['getId', 'addField'])
+ ->getMock();
+
+ $elementMock->expects($this->once())
+ ->method('getId')
+ ->willReturn('action_fieldset');
+
+ $elementMock->expects($this->once())
+ ->method('addField');
+
+ $formMock->expects($this->once())
+ ->method('getElements')
+ ->willReturn([$elementMock]);
+
+ $observerMock->expects($this->once())
+ ->method('getForm')
+ ->willReturn($formMock);
+
+ $this->model->prepareForm($observerMock);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
index 21bdf26edee..3e82bce9295 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\OfflineShipping\Model\SalesRule;
+namespace Magento\OfflineShipping\Model\Plugin\Checkout\Block\Cart;
class ShippingTest extends \PHPUnit_Framework_TestCase
{
--
GitLab
From 14a47b68739e0292944ede8aff9ee14be29b8008 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 17:18:43 +0200
Subject: [PATCH 074/120] MAGETWO-31363: Unit and Integration tests coverage
---
.../Adminhtml/Carrier/Tablerate/GridTest.php | 80 +++++++++++++++++++
.../Model/Config/Source/TablerateTest.php | 47 +++++++++++
2 files changed, 127 insertions(+)
create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
new file mode 100644
index 00000000000..4261fd95380
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate;
+
+class GridTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $storeManagerMock;
+
+ protected function setUp()
+ {
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $context = $objectManager->getObject('Magento\Backend\Block\Template\Context', [
+ 'storeManager' => $this->storeManagerMock
+ ]);
+
+ $this->model = $objectManager->getObject('Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid', [
+ 'context' => $context,
+ ]);
+ }
+
+ public function testSetWebsiteId()
+ {
+ $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->storeManagerMock->expects($this->once())
+ ->method('getWebsite')
+ ->willReturn($websiteMock);
+
+ $this->model->setWebsiteId(1);
+ }
+
+ public function testGetWebsiteId()
+ {
+ $websiteId = 10;
+
+ $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')
+ ->disableOriginalConstructor()
+ ->setMethods(['getId'])
+ ->getMock();
+
+ $websiteMock->expects($this->once())
+ ->method('getId')
+ ->willReturn($websiteId);
+
+ $this->storeManagerMock->expects($this->once())
+ ->method('getWebsite')
+ ->willReturn($websiteMock);
+
+ $this->assertEquals($websiteId, $this->model->getWebsiteId());
+ }
+
+ public function testSetConditionName()
+ {
+ $this->assertEquals($this->model, $this->model->setConditionName('someName'));
+ }
+
+ public function testGetConditionName()
+ {
+ $conditionName = 'someName';
+ $this->assertEquals($conditionName, $this->model->setConditionName($conditionName)->getConditionName());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
new file mode 100644
index 00000000000..8eea5073c3f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Config\Source;
+
+class TablerateTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflineShipping\Model\Config\Source\Tablerate
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\OfflineShipping\Model\Carrier\Tablerate|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $carrierTablerateMock;
+
+ protected function setUp()
+ {
+ $this->carrierTablerateMock = $this->getMockBuilder('\Magento\OfflineShipping\Model\Carrier\Tablerate')
+ ->disableOriginalConstructor()
+ ->setMethods(['getCode'])
+ ->getMock();
+
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->model = $helper->getObject('Magento\OfflineShipping\Model\Config\Source\Tablerate', [
+ 'carrierTablerate' => $this->carrierTablerateMock
+ ]);
+ }
+
+ public function testToOptionArray()
+ {
+ $codes = [1, 2, 3, 4, 5];
+ $expected = [];
+ foreach ($codes as $k => $v) {
+ $expected[] = ['value' => $k, 'label' => $v];
+ }
+
+ $this->carrierTablerateMock->expects($this->once())
+ ->method('getCode')
+ ->willReturn($codes);
+
+ $this->assertEquals($expected, $this->model->toOptionArray());
+ }
+}
--
GitLab
From 6c311ce4406c8d1010694b85f7e8fabd96e8c71c Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Mon, 19 Jan 2015 13:59:47 +0200
Subject: [PATCH 075/120] MAGETWO-32782: [TD] Third party interfaces are not
supported by single-tenant compiler
- implemented check for external interfaces mention in preferences configuration
- removed obsolete types from config
---
app/code/Magento/Backend/etc/di.xml | 1 -
app/code/Magento/Core/etc/di.xml | 2 -
.../Tools/Di/Compiler/Config/ReaderTest.php | 239 +++++++++++++-----
.../Tools/Di/Code/Reader/ClassesScanner.php | 2 +-
.../Tools/Di/Compiler/Config/Reader.php | 24 +-
.../Tools/Di/Definition/Collection.php | 8 +-
.../ObjectManager/Config/Compiled.php | 10 +
.../Framework/ObjectManager/Config/Config.php | 10 +
.../ObjectManager/ConfigInterface.php | 7 +
9 files changed, 233 insertions(+), 70 deletions(-)
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 2871ef2508f..5445af580b2 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -12,7 +12,6 @@
<preference for="Magento\Backend\Model\Config\Structure\SearchInterface" type="Magento\Backend\Model\Config\Structure" />
<preference for="Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Backend\Model\Config\Backend\File\RequestData" />
<preference for="Magento\Backend\Model\Auth\Credential\StorageInterface" type="Magento\User\Model\User" />
- <preference for="Magento\Adminhtml\Helper\Data" type="Magento\Backend\Helper\Data" />
<preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
<preference for="Magento\Backend\Model\UrlInterface" type="Magento\Backend\Model\Url" />
<preference for="Magento\Backend\Block\Widget\Button\ToolbarInterface" type="Magento\Backend\Block\Widget\Button\Toolbar" />
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index cc73a8a5b38..3b6eb72b2b3 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -14,14 +14,12 @@
<preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\DefaultPolicy" />
<preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Framework\Authorization\RoleLocator\DefaultRoleLocator" />
<preference for="Magento\Framework\Session\SessionManagerInterface" type="Magento\Framework\Session\Generic" />
- <preference for="Magento\Core\Model\DataService\ConfigInterface" type="Magento\Core\Model\DataService\Config" />
<preference for="Magento\Framework\App\Config\ScopeConfigInterface" type="Magento\Framework\App\Config" />
<preference for="Magento\Framework\App\Config\ReinitableConfigInterface" type="Magento\Framework\App\ReinitableConfig" />
<preference for="Magento\Framework\App\Config\MutableScopeConfigInterface" type="Magento\Framework\App\MutableScopeConfig" />
<preference for="Magento\Framework\App\Config\Storage\WriterInterface" type="Magento\Framework\App\Config\Storage\Writer" />
<preference for="Magento\Framework\View\Design\Theme\FileInterface" type="Magento\Core\Model\Theme\File" />
<preference for="Magento\Framework\Config\ConverterInterface" type="Magento\Framework\Config\Converter\Dom"/>
- <preference for="Magento\Core\Model\Url\SecurityInfoInterface" type="Magento\Core\Model\Url\SecurityInfo\Proxy" />
<preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Framework\App\DefaultPath\DefaultPath" />
<preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
<preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
index 7ccdb02d206..5bfc5e0cc70 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Tools\Di\Compiler\Config;
+use Magento\Framework\App\Area;
+use Magento\Tools\Di\Definition\Collection;
+
class ReaderTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -54,6 +57,9 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
false
);
$this->argumentsResolver = $this->getMock('Magento\Tools\Di\Compiler\ArgumentsResolver', [], [], '', false);
+ $this->argumentsResolverFactory->expects($this->any())
+ ->method('create')
+ ->willReturn($this->argumentsResolver);
$this->classReaderDecorator = $this->getMock(
'Magento\Tools\Di\Code\Reader\ClassReaderDecorator',
[],
@@ -72,71 +78,182 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
);
}
- public function testGenerateCachePerScopeExtends()
+ public function testGenerateCachePerScopeGlobal()
{
- $definitionsCollection = $this->getMock('Magento\Tools\Di\Definition\Collection', [], [], '', false);
- $this->diContainerConfig->expects($this->once())
- ->method('extend')
- ->with([]);
- $this->configLoader->expects($this->once())
- ->method('load')
- ->with('areaCode')
- ->willReturn([]);
-
- $this->argumentsResolverFactory->expects($this->once())
- ->method('create')
- ->with($this->diContainerConfig)
- ->willReturn($this->argumentsResolver);
- $definitionsCollection->expects($this->exactly(2))
- ->method('getInstancesNamesList')
- ->willReturn(['instanceType1'], ['instanceType2']);
- $definitionsCollection->expects($this->once())
- ->method('getInstanceArguments')
- ->willReturnMap([
- ['instanceType1', null],
- ['instanceType2', ['arg1', 'arg2']],
- ]);
- $this->typeReader->expects($this->exactly(3))
- ->method('isConcrete')
- ->willReturnMap([
- ['instanceType1', true],
- ['instanceType2', false],
- ['originalType1', true],
- ['originalType2', false],
- ]);
- $this->argumentsResolver->expects($this->exactly(2))
- ->method('getResolvedConstructorArguments')
- ->willReturnMap([
- ['instanceType1', 'resolvedConstructor1'],
- ['instanceVirtualType1', 'resolvedConstructor2'],
- ]);
- $this->diContainerConfig->expects($this->exactly(2))
+ $definitionCollection = $this->getDefinitionsCollection();
+ $this->diContainerConfig->expects($this->any())
->method('getVirtualTypes')
- ->willReturn(['instanceVirtualType1' => 1, 'instanceVirtualType2' => 2]);
- $this->diContainerConfig->expects($this->exactly(4))
+ ->willReturn($this->getVirtualTypes());
+ $this->diContainerConfig->expects($this->any())
+ ->method('getPreferences')
+ ->willReturn($this->getPreferences());
+
+ $getResolvedConstructorArgumentsMap = $this->getResolvedVirtualConstructorArgumentsMap(
+ $definitionCollection,
+ $this->getVirtualTypes()
+ );
+
+ $this->diContainerConfig->expects($this->any())
->method('getInstanceType')
- ->willReturnMap([
- ['instanceVirtualType1', 'originalType1'],
- ['instanceVirtualType2', 'originalType2'],
- ]);
- $definitionsCollection->expects($this->exactly(2))
- ->method('hasInstance')
- ->willReturn('');
- $this->classReaderDecorator->expects($this->once())
- ->method('getConstructor')
- ->willReturn('constructor');
- $this->diContainerConfig->expects($this->once())
+ ->willReturnMap($this->getInstanceTypeMap($this->getVirtualTypes()));
+
+ $this->diContainerConfig->expects($this->any())
->method('isShared')
- ->willReturnMap([
- ['instanceType1', true],
- ['instanceType2', false],
- ]);
- $this->diContainerConfig->expects($this->once())
+ ->willReturnMap($this->getExpectedNonShared());
+
+ $this->diContainerConfig->expects($this->any())
->method('getPreference')
- ->willReturnMap([
- ['instanceType1', 'instanceType1ss'],
- ['instanceType2', 'instanceType2'],
- ]);
- $this->model->generateCachePerScope($definitionsCollection, 'areaCode');
+ ->willReturnMap($this->getPreferencesMap());
+
+ $isConcreteMap = [];
+ foreach($definitionCollection->getInstancesNamesList() as $instanceType) {
+ $isConcreteMap[] = [$instanceType, strpos($instanceType, 'Interface') === false];
+
+ $getResolvedConstructorArgumentsMap[] = [
+ $instanceType,
+ $definitionCollection->getInstanceArguments($instanceType),
+ $this->getResolvedArguments(
+ $definitionCollection->getInstanceArguments($instanceType)
+ )
+ ];
+ }
+
+ $this->typeReader->expects($this->any())
+ ->method('isConcrete')
+ ->willReturnMap($isConcreteMap);
+ $this->argumentsResolver->expects($this->any())
+ ->method('getResolvedConstructorArguments')
+ ->willReturnMap($getResolvedConstructorArgumentsMap);
+
+ $this->assertEquals(
+ $this->getExpectedGlobalConfig(),
+ $this->model->generateCachePerScope($definitionCollection, Area::AREA_GLOBAL)
+ );
+ }
+
+ /**
+ * @return array
+ */
+ private function getExpectedGlobalConfig()
+ {
+ return [
+ 'arguments' => [
+ 'ConcreteType1' => serialize(['resolved_argument1', 'resolved_argument2']),
+ 'ConcreteType2' => serialize(['resolved_argument1', 'resolved_argument2']),
+ 'virtualType1' => serialize(['resolved_argument1', 'resolved_argument2'])
+ ],
+ 'nonShared' => [
+ 'ConcreteType2' => true,
+ 'ThirdPartyInterface' => true
+ ],
+ 'preferences' => $this->getPreferences(),
+ 'instanceTypes' => $this->getVirtualTypes(),
+ ];
+ }
+
+ /**
+ * @return Collection
+ */
+ private function getDefinitionsCollection()
+ {
+ $definitionCollection = new Collection();
+ $definitionCollection->addDefinition('ConcreteType1', ['argument1', 'argument2']);
+ $definitionCollection->addDefinition('ConcreteType2', ['argument1', 'argument2']);
+ $definitionCollection->addDefinition('Interface1', [null]);
+
+ return $definitionCollection;
+ }
+
+ /**
+ * @return array
+ */
+ private function getVirtualTypes()
+ {
+ return ['virtualType1' => 'ConcreteType1'];
+ }
+
+ /**
+ * @return array
+ */
+ private function getExpectedNonShared()
+ {
+ return [
+ ['ConcreteType1', true],
+ ['ConcreteType2', false],
+ ['Interface1', true],
+ ['ThirdPartyInterface', false]
+ ];
+ }
+
+ /**
+ * @return array
+ */
+ private function getPreferences()
+ {
+ return [
+ 'Interface1' => 'ConcreteType1',
+ 'ThirdPartyInterface' => 'ConcreteType2'
+ ];
+ }
+
+ /**
+ * @return array
+ */
+ private function getPreferencesMap()
+ {
+ return [
+ ['ConcreteType1', 'ConcreteType1'],
+ ['ConcreteType2', 'ConcreteType2'],
+ ['Interface1', 'ConcreteType1'],
+ ['ThirdPartyInterface', 'ConcreteType2']
+ ];
+ }
+
+ /**
+ * @param array $arguments
+ * @return array|null
+ */
+ private function getResolvedArguments($arguments)
+ {
+ return empty($arguments) ? null : array_map(
+ function($argument) {
+ return 'resolved_' . $argument;
+ },
+ $arguments
+ );
+ }
+
+ /**
+ * @param array $virtualTypes
+ * @return array
+ */
+ private function getInstanceTypeMap($virtualTypes)
+ {
+ $getInstanceTypeMap = [];
+ foreach ($virtualTypes as $virtualType => $concreteType) {
+ $getInstanceTypeMap[] = [$virtualType, $concreteType];
+ }
+
+ return $getInstanceTypeMap;
+ }
+
+ /**
+ * @param Collection $definitionCollection
+ * @param array $virtualTypes
+ * @return array
+ */
+ private function getResolvedVirtualConstructorArgumentsMap(Collection $definitionCollection, array $virtualTypes)
+ {
+ $getResolvedConstructorArgumentsMap = [];
+ foreach ($virtualTypes as $virtualType => $concreteType) {
+ $getResolvedConstructorArgumentsMap[] = [
+ $virtualType,
+ $definitionCollection->getInstanceArguments($concreteType),
+ $this->getResolvedArguments(
+ $definitionCollection->getInstanceArguments($concreteType)
+ )
+ ];
+ }
+ return $getResolvedConstructorArgumentsMap;
}
}
diff --git a/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php b/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php
index 42076377419..97063a236a2 100644
--- a/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php
+++ b/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php
@@ -41,7 +41,7 @@ class ClassesScanner
}
$classes = [];
$recursiveIterator = new \RecursiveIteratorIterator(
- new \RecursiveDirectoryIterator($realPath),
+ new \RecursiveDirectoryIterator($realPath, \FilesystemIterator::FOLLOW_SYMLINKS),
\RecursiveIteratorIterator::SELF_FIRST
);
/** @var $fileItem \SplFileInfo */
diff --git a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
index 8dca09ef4e2..126d1eaf554 100644
--- a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
+++ b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
@@ -49,7 +49,7 @@ class Reader
* @param Type $typeReader
*/
public function __construct(
- \Magento\Framework\ObjectManager\ConfigInterface $diContainerConfig,
+ ConfigInterface $diContainerConfig,
App\ObjectManager\ConfigLoader $configLoader,
ArgumentsResolverFactory $argumentsResolverFactory,
ClassReaderDecorator $classReaderDecorator,
@@ -86,6 +86,8 @@ class Reader
$config['arguments'][$key] = serialize($value);
}
}
+
+ $this->fillThirdPartyInterfaces($areaConfig, $definitionsCollection);
foreach ($definitionsCollection->getInstancesNamesList() as $instanceName) {
if (!$areaConfig->isShared($instanceName)) {
$config['nonShared'][$instanceName] = true;
@@ -95,6 +97,7 @@ class Reader
$config['preferences'][$instanceName] = $preference;
}
}
+
foreach (array_keys($areaConfig->getVirtualTypes()) as $virtualType) {
$config['instanceTypes'][$virtualType] = $areaConfig->getInstanceType($virtualType);
}
@@ -140,4 +143,23 @@ class Reader
}
return $constructors;
}
+
+ /**
+ * Returns preferences for third party code
+ *
+ * @param ConfigInterface $config
+ * @param DefinitionsCollection $definitionsCollection
+ */
+ private function fillThirdPartyInterfaces(ConfigInterface $config, DefinitionsCollection $definitionsCollection)
+ {
+ $definedInstances = $definitionsCollection->getInstancesNamesList();
+
+ foreach ($config->getPreferences() as $interface => $preference) {
+ if (in_array($interface, $definedInstances)) {
+ continue;
+ }
+
+ $definitionsCollection->addDefinition($interface, []);
+ }
+ }
}
diff --git a/dev/tools/Magento/Tools/Di/Definition/Collection.php b/dev/tools/Magento/Tools/Di/Definition/Collection.php
index 82638c7c557..2fbde66b294 100644
--- a/dev/tools/Magento/Tools/Di/Definition/Collection.php
+++ b/dev/tools/Magento/Tools/Di/Definition/Collection.php
@@ -33,7 +33,7 @@ class Collection
*
* @return void
*/
- public function initialize($definitions)
+ public function initialize(array $definitions)
{
$this->definitions = $definitions;
}
@@ -54,7 +54,7 @@ class Collection
* Add new definition for instance
*
* @param string $instance
- * @param array $arguments
+ * @param array|null $arguments
*
* @return void
*/
@@ -63,11 +63,11 @@ class Collection
$this->definitions[$instance] = $arguments;
}
- /**
+ /**+
* Returns instance arguments
*
* @param string $instanceName
- * @return null
+ * @return null|array
*/
public function getInstanceArguments($instanceName)
{
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index 131e4bfcbaa..a7484882066 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -145,4 +145,14 @@ class Compiled implements \Magento\Framework\ObjectManager\ConfigInterface
{
return $this->virtualTypes;
}
+
+ /**
+ * Returns list on preferences
+ *
+ * @return array
+ */
+ public function getPreferences()
+ {
+ return $this->preferences;
+ }
}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
index 29c0432bdc5..6f05e61be53 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
@@ -313,4 +313,14 @@ class Config implements \Magento\Framework\ObjectManager\ConfigInterface
{
return $this->_virtualTypes;
}
+
+ /**
+ * Returns list on preferences
+ *
+ * @return array
+ */
+ public function getPreferences()
+ {
+ return $this->_preferences;
+ }
}
diff --git a/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php b/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
index 9e023fcc5e3..8f8f91297dc 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
@@ -72,4 +72,11 @@ interface ConfigInterface
* @return void
*/
public function extend(array $configuration);
+
+ /**
+ * Returns list on preferences
+ *
+ * @return array
+ */
+ public function getPreferences();
}
--
GitLab
From a59c1960866c5497db31b3e12247a682c0af042f Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Mon, 19 Jan 2015 16:32:26 +0200
Subject: [PATCH 076/120] MAGETWO-32782: [TD] Third party interfaces are not
supported by single-tenant compiler
- fixed fill of third party interfaces
---
dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
index 126d1eaf554..79ce889e6ff 100644
--- a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
+++ b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
@@ -80,6 +80,8 @@ class Reader
}
$config = [];
+
+ $this->fillThirdPartyInterfaces($areaConfig, $definitionsCollection);
$config['arguments'] = $this->getConfigForScope($definitionsCollection, $areaConfig);
foreach ($config['arguments'] as $key => $value) {
if ($value !== null) {
@@ -87,7 +89,6 @@ class Reader
}
}
- $this->fillThirdPartyInterfaces($areaConfig, $definitionsCollection);
foreach ($definitionsCollection->getInstancesNamesList() as $instanceName) {
if (!$areaConfig->isShared($instanceName)) {
$config['nonShared'][$instanceName] = true;
--
GitLab
From 887afb4eda2fc78ad71e5a5d5ba8360f8b3e85d6 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Mon, 19 Jan 2015 18:13:30 +0200
Subject: [PATCH 077/120] MAGETWO-32592: MTF Alternative Web Driver pull
request preparation
---
.../Test/Block/Adminhtml/Category/Edit/Tab/Product.php | 5 ++---
.../Block/Adminhtml/Product/Edit/Tab/ProductDetails.php | 8 ++++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
index 1ae74d61908..5b5054cda3d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
@@ -9,7 +9,6 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
use Mtf\Client\Element\SimpleElement;
use Magento\Catalog\Test\Block\Adminhtml\Category\Tab\ProductGrid;
-use Mtf\Client\Element;
/**
* Products grid of Category Products tab.
@@ -51,10 +50,10 @@ class Product extends Tab
* Get data of tab.
*
* @param array|null $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return array
*/
- public function getDataFormTab($fields = null, Element $element = null)
+ public function getDataFormTab($fields = null, SimpleElement $element = null)
{
$data = $this->dataMapping($fields);
$result = [];
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
index 6d4db31a1b2..a78b3fef4db 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
-use Mtf\Client\Element;
-use Mtf\Client\Element\Locator;
+use Mtf\Client\Element\SimpleElement;
+use Mtf\Client\Locator;
/**
* Product details tab.
@@ -32,10 +32,10 @@ class ProductDetails extends \Magento\Catalog\Test\Block\Adminhtml\Product\Edit\
* Fill data to fields on tab.
*
* @param array $fields
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fillFormTab(array $fields, Element $element = null)
+ public function fillFormTab(array $fields, SimpleElement $element = null)
{
$data = $this->dataMapping($fields);
--
GitLab
From 421e77b375ccb3b82e9143eca4134b9dfc5dbf31 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Mon, 19 Jan 2015 19:23:54 +0200
Subject: [PATCH 078/120] MAGETWO-32081: MTF Alternative Web Driver pull
request preparation
---
.../functional/lib/Mtf/Client/Element/SelectstoreElement.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php b/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
index b919dd2b79c..f2e914969f2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
@@ -63,7 +63,7 @@ class SelectstoreElement extends SelectElement
. $pieces[2] . '")]';
}
- $option = $this->_context->find($optionLocator, Locator::SELECTOR_XPATH);
+ $option = $this->context->find($optionLocator, Locator::SELECTOR_XPATH);
if (!$option->isVisible()) {
throw new \Exception('[' . implode('/', $pieces) . '] option is not visible in store switcher.');
}
--
GitLab
From e2c43cacbf931c6e3e187c6e94498963bebb40f3 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Mon, 19 Jan 2015 20:56:16 +0200
Subject: [PATCH 079/120] MAGETWO-32081: MTF Alternative Web Driver pull
request preparation
---
.../functional/lib/Mtf/Client/Element/ConditionsElement.php | 2 +-
.../app/Magento/Customer/Test/Block/Form/CustomerForm.php | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
index 54a3f66d6c7..eeaed524ba2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
@@ -84,7 +84,7 @@ class ConditionsElement extends SimpleElement
*
* @var string
*/
- protected $created = './ul/li[1]';
+ protected $created = './ul/li[span[contains(@class,"rule-param-new-child")]]/preceding-sibling::li[1]';
/**
* Children condition
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 4e550698337..259a8e0d8e0 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Block\Form;
use Mtf\Block\Form;
-use Mtf\Client\Element;
+use Mtf\Client\Element\SimpleElement;
use Mtf\Fixture\FixtureInterface;
use Magento\Customer\Test\Fixture\CustomerInjectable;
@@ -51,10 +51,10 @@ class CustomerForm extends Form
* Fill the customer data
*
* @param FixtureInterface $customer
- * @param Element|null $element
+ * @param SimpleElement|null $element
* @return $this
*/
- public function fill(FixtureInterface $customer, Element $element = null)
+ public function fill(FixtureInterface $customer, SimpleElement $element = null)
{
/** @var CustomerInjectable $customer */
if ($customer->hasData()) {
--
GitLab
From d9b71a2007b6e1a72717bbc83c6ca1911a185902 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 11:37:20 +0200
Subject: [PATCH 080/120] MAGETWO-32081: MTF Alternative Web Driver pull
request preparation
---
.../functional/lib/Mtf/Client/Element/SuggestElement.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
index 83a5c83b660..fc1d685204e 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
@@ -59,8 +59,9 @@ class SuggestElement extends SimpleElement
$this->clear();
foreach (str_split($value) as $symbol) {
- $this->find($this->suggest)->click();
- $this->keys([$symbol]);
+ $input = $this->find($this->suggest);
+ $input->click();
+ $input->keys([$symbol]);
$this->waitResult();
$searchedItem = $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH);
if ($searchedItem->isVisible()) {
@@ -90,7 +91,7 @@ class SuggestElement extends SimpleElement
*/
public function waitResult()
{
- $browser = clone $this;
+ $browser = $this;
$selector = $this->suggestStateLoader;
$browser->waitUntil(
function () use ($browser, $selector) {
--
GitLab
From 0cdc03bb3593559576b185b896951629fd1ca2ad Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 11:47:56 +0200
Subject: [PATCH 081/120] MAGETWO-32081: MTF Alternative Web Driver pull
request preparation
---
.../lib/Mtf/Client/Element/OptgroupselectElement.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php b/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
index fc0353553fd..ecb06a901ca 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Mtf\Client\Element;
--
GitLab
From fd63128fdb02a1b0993371e758fdc6e74bcae278 Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Tue, 20 Jan 2015 11:51:59 +0200
Subject: [PATCH 082/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- Fixes for L1 fails
---
.../DownloadableTaxCalculationTest.php | 42 +++++++++++++++++--
1 file changed, 39 insertions(+), 3 deletions(-)
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
index 82b90a1bbec..c810efd7795 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\TestCase;
-use Magento\Tax\Test\TestCase\TaxCalculationTest;
+use Mtf\TestCase\Scenario;
/**
* Test tax calculation with downloadable product.
@@ -30,7 +30,43 @@ use Magento\Tax\Test\TestCase\TaxCalculationTest;
* @group Tax_(CS)
* @ZephyrId MAGETWO-32076
*/
-class DownloadableTaxCalculationTest extends TaxCalculationTest
+class DownloadableTaxCalculationTest extends Scenario
{
- //
+ /**
+ * Skip failed tests.
+ *
+ * @return void
+ */
+ public static function setUpBeforeClass()
+ {
+ self::markTestIncomplete("Epic: MAGETWO-30073");
+ }
+
+ /**
+ * Runs tax calculation test.
+ *
+ * @return void
+ */
+ public function test()
+ {
+ $this->executeScenario();
+ }
+
+ /**
+ * Tear down after each test.
+ *
+ * @return void
+ */
+ public function tearDown()
+ {
+ $this->objectManager->create('\Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep')->run();
+ $this->objectManager->create('\Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
+ $this->objectManager->create('\Magento\CatalogRule\Test\TestStep\DeleteAllCatalogRulesStep')->run();
+
+ // TODO: Move set default configuration to "tearDownAfterClass" method after fix bug MAGETWO-29331
+ $this->objectManager->create(
+ 'Magento\Core\Test\TestStep\SetupConfigurationStep',
+ ['configData' => 'default_tax_configuration']
+ )->run();
+ }
}
--
GitLab
From 5d4ee1a40413a72ec3047b4c48865fab63da4acd Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 12:13:54 +0200
Subject: [PATCH 083/120] MAGETWO-32592: MTF Alternative Web Driver pull
request preparation
---
.../Mtf/Client/Element/ConditionsElement.php | 29 ++++++++++---------
.../Client/Element/GlobalsearchElement.php | 2 +-
.../Mtf/Client/Element/JquerytreeElement.php | 6 ++--
.../Element/MultiselectgrouplistElement.php | 17 ++++++-----
.../Client/Element/MultiselectlistElement.php | 6 ++--
.../Client/Element/MultisuggestElement.php | 2 +-
.../lib/Mtf/Client/Element/Tree.php | 10 +++----
7 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
index eeaed524ba2..96cf6112ad3 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
@@ -8,6 +8,7 @@ namespace Mtf\Client\Element;
use Mtf\ObjectManager;
use Mtf\Client\Locator;
+use Mtf\Client\ElementInterface;
/**
* Class ConditionsElement
@@ -185,10 +186,10 @@ class ConditionsElement extends SimpleElement
* Add condition combination
*
* @param string $condition
- * @param SimpleElement $context
- * @return SimpleElement
+ * @param ElementInterface $context
+ * @return ElementInterface
*/
- protected function addConditionsCombination($condition, SimpleElement $context)
+ protected function addConditionsCombination($condition, ElementInterface $context)
{
$condition = $this->parseCondition($condition);
$newCondition = $context->find($this->newCondition, Locator::SELECTOR_XPATH);
@@ -208,10 +209,10 @@ class ConditionsElement extends SimpleElement
* Add conditions
*
* @param array $conditions
- * @param SimpleElement $context
+ * @param ElementInterface $context
* @return void
*/
- protected function addMultipleCondition(array $conditions, SimpleElement $context)
+ protected function addMultipleCondition(array $conditions, ElementInterface $context)
{
foreach ($conditions as $key => $condition) {
$elementContext = is_numeric($key) ? $context : $this->addConditionsCombination($key, $context);
@@ -227,10 +228,10 @@ class ConditionsElement extends SimpleElement
* Add single Condition
*
* @param string $condition
- * @param SimpleElement $context
+ * @param ElementInterface $context
* @return void
*/
- protected function addSingleCondition($condition, SimpleElement $context)
+ protected function addSingleCondition($condition, ElementInterface $context)
{
$condition = $this->parseCondition($condition);
@@ -253,15 +254,15 @@ class ConditionsElement extends SimpleElement
* Fill single condition
*
* @param array $rules
- * @param SimpleElement $element
+ * @param ElementInterface $element
* @return void
* @throws \Exception
*/
- protected function fillCondition(array $rules, SimpleElement $element)
+ protected function fillCondition(array $rules, ElementInterface $element)
{
$this->resetKeyParam();
foreach ($rules as $rule) {
- /** @var SimpleElement $param */
+ /** @var ElementInterface $param */
$param = $this->findNextParam($element);
$param->find('a')->click();
@@ -354,11 +355,11 @@ class ConditionsElement extends SimpleElement
/**
* Find next param of condition for fill
*
- * @param SimpleElement $context
- * @return SimpleElement
+ * @param ElementInterface $context
+ * @return ElementInterface
* @throws \Exception
*/
- protected function findNextParam(SimpleElement $context)
+ protected function findNextParam(ElementInterface $context)
{
do {
if (!isset($this->mapParams[$this->findKeyParam])) {
@@ -387,7 +388,7 @@ class ConditionsElement extends SimpleElement
*
* @return void
*/
- protected function waitForCondition(SimpleElement $element)
+ protected function waitForCondition(ElementInterface $element)
{
$this->waitUntil(
function () use ($element) {
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php b/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
index b84d290af21..1c8e0acc4c7 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
@@ -178,7 +178,7 @@ class GlobalsearchElement extends SimpleElement
$resultItems = $searchResult->getElements($this->resultItem);
$resultArray = [];
- /** @var SimpleElement $resultItem */
+ /** @var ElementInterface $resultItem */
foreach ($resultItems as $resultItem) {
$resultItemLink = $resultItem->find('a');
$resultText = $resultItemLink->isVisible()
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php b/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
index e08753499ea..c7d36387b3c 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
@@ -6,6 +6,8 @@
namespace Mtf\Client\Element;
+use Mtf\Client\ElementInterface;
+
/**
* Class JquerytreeElement
* Typified element class for JqueryTree elements
@@ -60,11 +62,11 @@ class JquerytreeElement extends Tree
/**
* Recursive walks tree
*
- * @param SimpleElement $node
+ * @param ElementInterface $node
* @param string $parentCssClass
* @return array
*/
- protected function _getNodeContent(SimpleElement $node, $parentCssClass)
+ protected function _getNodeContent(ElementInterface $node, $parentCssClass)
{
$counter = 1;
$nextNodeSelector = $parentCssClass . " > " . $this->nodeSelector . ":nth-of-type($counter)";
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
index 24c767851f5..f2fe3958147 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
@@ -7,6 +7,7 @@
namespace Mtf\Client\Element;
use Mtf\Client\Locator;
+use Mtf\Client\ElementInterface;
/**
* Class MultiselectgrouplistElement
@@ -151,11 +152,11 @@ class MultiselectgrouplistElement extends MultiselectElement
* Get optgroup
*
* @param string $value
- * @param SimpleElement $context
- * @return SimpleElement
+ * @param ElementInterface $context
+ * @return ElementInterface
* @throws \Exception
*/
- protected function getOptgroup($value, SimpleElement $context)
+ protected function getOptgroup($value, ElementInterface $context)
{
$optgroup = $context->find(sprintf($this->optgroupByLabel, $value), Locator::SELECTOR_XPATH);
if (!$optgroup->isVisible()) {
@@ -169,11 +170,11 @@ class MultiselectgrouplistElement extends MultiselectElement
* Get child optgroup
*
* @param string $value
- * @param SimpleElement $context
- * @return SimpleElement
+ * @param ElementInterface $context
+ * @return ElementInterface
* @throws \Exception
*/
- protected function getChildOptgroup($value, SimpleElement $context)
+ protected function getChildOptgroup($value, ElementInterface $context)
{
$childOptgroup = null;
$count = 1;
@@ -210,7 +211,7 @@ class MultiselectgrouplistElement extends MultiselectElement
foreach ($this->getSelectedOptions() as $option) {
$value = [];
- /** @var SimpleElement $option */
+ /** @var ElementInterface $option */
$optionText = $option->getText();
$optionValue = trim($optionText, $this->trim);
$value[] = $optionValue;
@@ -254,7 +255,7 @@ class MultiselectgrouplistElement extends MultiselectElement
/**
* Get options
*
- * @return SimpleElement[]
+ * @return ElementInterface[]
*/
protected function getOptions()
{
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
index acc0ea4befb..c7c01a8de68 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
@@ -39,7 +39,7 @@ class MultiselectlistElement extends MultiselectElement
$values = is_array($values) ? $values : [$values];
foreach ($options as $option) {
- /** @var SimpleElement $option */
+ /** @var \Mtf\Client\ElementInterface $option */
$optionText = $option->getText();
$isChecked = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH)->isVisible();
$inArray = in_array($optionText, $values);
@@ -60,7 +60,7 @@ class MultiselectlistElement extends MultiselectElement
$options = $this->getOptions();
foreach ($options as $option) {
- /** @var SimpleElement $option */
+ /** @var \Mtf\Client\ElementInterface $option */
$checkedOption = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH);
if ($checkedOption->isVisible()) {
$checkedOptions[] = $checkedOption->getText();
@@ -101,7 +101,7 @@ class MultiselectlistElement extends MultiselectElement
$options = $this->getOptions();
foreach ($options as $option) {
- /** @var SimpleElement $option */
+ /** @var \Mtf\Client\ElementInterface $option */
$optionsValue[] = $option->getText();
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
index e53cc52a441..daffc52b3ae 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
@@ -73,7 +73,7 @@ class MultisuggestElement extends SuggestElement
$values = [];
foreach ($choices as $choice) {
- /** @var SimpleElement $choice */
+ /** @var \Mtf\Client\ElementInterface $choice */
$values[] = $choice->getText();
}
return $values;
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
index 40f6883d92d..77d9808e689 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
@@ -94,7 +94,7 @@ abstract class Tree extends SimpleElement
++$pathChunkCounter;
}
if ($structureChunk) {
- /** @var SimpleElement $needleElement */
+ /** @var ElementInterface $needleElement */
$needleElement = $structureChunk->find($this->nodeName);
$needleElement->click();
} else {
@@ -108,7 +108,7 @@ abstract class Tree extends SimpleElement
*
* @param string $pathChunk
* @param array $structureChunk
- * @return array|SimpleElement|false
+ * @return array|ElementInterface|false
*/
protected function deep($pathChunk, $structureChunk)
{
@@ -127,11 +127,11 @@ abstract class Tree extends SimpleElement
/**
* Recursive walks tree
*
- * @param SimpleElement $node
+ * @param ElementInterface $node
* @param string $parentCssClass
* @return array
*/
- protected function _getNodeContent(SimpleElement $node, $parentCssClass)
+ protected function _getNodeContent(ElementInterface $node, $parentCssClass)
{
$nodeArray = [];
$nodeList = [];
@@ -145,7 +145,7 @@ abstract class Tree extends SimpleElement
}
//Write to array values of current node
foreach ($nodeList as $currentNode) {
- /** @var SimpleElement $currentNode */
+ /** @var ElementInterface $currentNode */
$nodesNames = $currentNode->find($this->nodeName);
$nodesContents = $currentNode->find($this->nodeCssClass);
$text = ltrim($nodesNames->getText());
--
GitLab
From 567d9e16692aa2811f5740261995bf7d2f1b63dc Mon Sep 17 00:00:00 2001
From: Iryna Savchenko <isavchenko@ebay.com>
Date: Tue, 20 Jan 2015 12:53:32 +0200
Subject: [PATCH 084/120] MAGETWO-31363: [MPI] Unit and Integration tests
coverage
---
.../Block/Form/BanktransferTest.php | 37 ++++++++
.../Block/Form/Cashondelivery.php | 37 ++++++++
.../Block/Info/CheckmoTest.php | 91 +++++++++++++++++++
.../Model/BanktransferTest.php | 19 +++-
.../Model/CashondeliveryTest.php | 19 +++-
.../OfflinePayments/Model/CheckmoTest.php | 80 ++++++++++++++++
.../OfflinePayments/Model/ObserverTest.php | 59 ++++++++++++
.../Model/PurchaseorderTest.php | 52 +++++++++++
8 files changed, 390 insertions(+), 4 deletions(-)
create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Model/PurchaseorderTest.php
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
new file mode 100644
index 00000000000..80eb7a7ac3e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Form;
+
+class BanktransferTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflinePayments\Block\Form\Banktransfer
+ */
+ protected $_object;
+
+ protected function setUp()
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->_object = $objectManagerHelper->getObject('Magento\OfflinePayments\Block\Form\Banktransfer');
+ }
+
+ public function testGetInstructions()
+ {
+ $method = $this->getMock(
+ 'Magento\Payment\Model\MethodInterface',
+ ['getInstructions', 'getCode', 'getFormBlockType', 'getTitle'],
+ [],
+ '',
+ false
+ );
+ $method->expects($this->once())
+ ->method('getInstructions')
+ ->willReturn('instructions');
+ $this->_object->setData('method', $method);
+
+ $this->assertEquals('instructions', $this->_object->getInstructions());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
new file mode 100644
index 00000000000..ba0a899bb48
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Form;
+
+class CashondeliveryTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflinePayments\Block\Form\Cashondelivery
+ */
+ protected $_object;
+
+ protected function setUp()
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->_object = $objectManagerHelper->getObject('Magento\OfflinePayments\Block\Form\Cashondelivery');
+ }
+
+ public function testGetInstructions()
+ {
+ $method = $this->getMock(
+ 'Magento\Payment\Model\MethodInterface',
+ ['getInstructions', 'getCode', 'getFormBlockType', 'getTitle'],
+ [],
+ '',
+ false
+ );
+ $method->expects($this->once())
+ ->method('getInstructions')
+ ->willReturn('instructions');
+ $this->_object->setData('method', $method);
+
+ $this->assertEquals('instructions', $this->_object->getInstructions());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
new file mode 100644
index 00000000000..88314b0b1af
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Info;
+
+class CheckmoTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflinePayments\Block\Info\Checkmo
+ */
+ protected $_object;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_scopeConfig;
+
+ protected function setUp()
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
+ $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
+ $this->_scopeConfig = $this->getMock(
+ 'Magento\Framework\App\Config\ScopeConfigInterface',
+ ['getValue', 'isSetFlag'],
+ [],
+ '',
+ false
+ );
+ $this->_object = $objectManagerHelper->getObject(
+ 'Magento\OfflinePayments\Block\Info\Checkmo',
+ [
+ 'eventManager' => $eventManager,
+ 'paymentData' => $paymentDataMock,
+ 'scopeConfig' => $this->_scopeConfig,
+ ]
+ );
+ }
+
+ /**
+ * @dataProvider getPayableToDataProvider
+ */
+ public function testGetPayableTo($details, $expected)
+ {
+ $info = $this->getMock('Magento\Payment\Model\Info', ['getAdditionalData'], [], '', false);
+ $info->expects($this->once())
+ ->method('getAdditionalData')
+ ->willReturn(serialize($details));
+ $this->_object->setData('info', $info);
+
+ $this->assertEquals($expected, $this->_object->getPayableTo());
+ }
+
+ /**
+ * @return array
+ */
+ public function getPayableToDataProvider()
+ {
+ return [
+ [['payable_to' => 'payable'], 'payable'],
+ ['', '']
+ ];
+ }
+
+ /**
+ * @dataProvider getMailingAddressDataProvider
+ */
+ public function testGetMailingAddress($details, $expected)
+ {
+ $info = $this->getMock('Magento\Payment\Model\Info', ['getAdditionalData'], [], '', false);
+ $info->expects($this->once())
+ ->method('getAdditionalData')
+ ->willReturn(serialize($details));
+ $this->_object->setData('info', $info);
+
+ $this->assertEquals($expected, $this->_object->getMailingAddress());
+ }
+
+ /**
+ * @return array
+ */
+ public function getMailingAddressDataProvider()
+ {
+ return [
+ [['mailing_address' => 'blah@blah.com'], 'blah@blah.com'],
+ ['', '']
+ ];
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
index 7dbc702c60f..a8705a4dc8f 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
@@ -12,18 +12,23 @@ class BanktransferTest extends \PHPUnit_Framework_TestCase
*/
protected $_object;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_scopeConfig;
+
protected function setUp()
{
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
$paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
- $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+ $this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
$this->_object = $objectManagerHelper->getObject(
'Magento\OfflinePayments\Model\Banktransfer',
[
'eventManager' => $eventManager,
'paymentData' => $paymentDataMock,
- 'scopeConfig' => $scopeConfig,
+ 'scopeConfig' => $this->_scopeConfig,
]
);
}
@@ -32,4 +37,14 @@ class BanktransferTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
}
+
+ public function testGetInstructions()
+ {
+ $this->_object->setStore(1);
+ $this->_scopeConfig->expects($this->once())
+ ->method('getValue')
+ ->with('payment/banktransfer/instructions', 'store', 1)
+ ->willReturn('payment configuration');
+ $this->assertEquals('payment configuration', $this->_object->getInstructions());
+ }
}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
index e0f11d0283b..97bdf1127e5 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
@@ -12,6 +12,11 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
*/
protected $_object;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_scopeConfig;
+
protected function setUp()
{
$helper = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -19,13 +24,13 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
$paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
- $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+ $this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
$this->_object = $helper->getObject(
'Magento\OfflinePayments\Model\Cashondelivery',
[
'eventManager' => $eventManager,
'paymentData' => $paymentDataMock,
- 'scopeConfig' => $scopeConfig,
+ 'scopeConfig' => $this->_scopeConfig,
]
);
}
@@ -34,4 +39,14 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
}
+
+ public function testGetInstructions()
+ {
+ $this->_object->setStore(1);
+ $this->_scopeConfig->expects($this->once())
+ ->method('getValue')
+ ->with('payment/cashondelivery/instructions', 'store', 1)
+ ->willReturn('payment configuration');
+ $this->assertEquals('payment configuration', $this->_object->getInstructions());
+ }
}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php
new file mode 100644
index 00000000000..b6aee65b11e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Model;
+
+class CheckmoTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflinePayments\Model\Checkmo
+ */
+ protected $_object;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_scopeConfig;
+
+ protected function setUp()
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
+ $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
+ $this->_scopeConfig = $this->getMock(
+ 'Magento\Framework\App\Config\ScopeConfigInterface',
+ ['getValue', 'isSetFlag'],
+ [],
+ '',
+ false
+ );
+ $this->_object = $objectManagerHelper->getObject(
+ 'Magento\OfflinePayments\Model\Checkmo',
+ [
+ 'eventManager' => $eventManager,
+ 'paymentData' => $paymentDataMock,
+ 'scopeConfig' => $this->_scopeConfig,
+ ]
+ );
+ }
+
+ public function testGetPayableTo()
+ {
+ $this->_object->setStore(1);
+ $this->_scopeConfig->expects($this->once())
+ ->method('getValue')
+ ->with('payment/checkmo/payable_to', 'store', 1)
+ ->willReturn('payable');
+ $this->assertEquals('payable', $this->_object->getPayableTo());
+ }
+
+ public function testGetMailingAddress()
+ {
+ $this->_object->setStore(1);
+ $this->_scopeConfig->expects($this->once())
+ ->method('getValue')
+ ->with('payment/checkmo/mailing_address', 'store', 1)
+ ->willReturn('blah@blah.com');
+ $this->assertEquals('blah@blah.com', $this->_object->getMailingAddress());
+ }
+
+ public function testAssignData()
+ {
+ $details['payable_to'] = 'payable';
+ $details['mailing_address'] = 'blah@blah.com';
+ $this->_object->setStore(1);
+ $this->_scopeConfig->expects($this->any())
+ ->method('getValue')
+ ->willReturnMap([
+ ['payment/checkmo/payable_to', 'store', 1, 'payable'],
+ ['payment/checkmo/mailing_address', 'store', 1, 'blah@blah.com']
+ ]);
+ $instance = $this->getMock('Magento\Payment\Model\Info', ['setAdditionalData'], [], '', false);
+ $instance->expects($this->once())
+ ->method('setAdditionalData')
+ ->with(serialize($details));
+ $this->_object->setData('info_instance', $instance);
+ $this->_object->assignData('');
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
new file mode 100644
index 00000000000..34f9c0da865
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Model;
+
+class ObserverTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflinePayments\Model\Observer
+ */
+ protected $_model;
+
+ protected function setUp()
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->_model = $objectManagerHelper->getObject('Magento\OfflinePayments\Model\Observer');
+ }
+
+ public function testBeforeOrderPaymentSave()
+ {
+ $observer = $this->getMock('Magento\Framework\Event\Observer', ['getEvent'], [], '', false);
+ $event = $this->getMock('Magento\Framework\Event', ['getPayment'], [], '', false);
+ $payment = $this->getMock(
+ 'Magento\Sales\Model\Order\Payment',
+ ['getMethod', 'setAdditionalInformation', 'getMethodInstance'],
+ [],
+ '',
+ false
+ );
+ $payment->expects($this->once())
+ ->method('getMethod')
+ ->willReturn('banktransfer');
+ $payment->expects($this->once())
+ ->method('setAdditionalInformation')
+ ->with('instructions', 'payment configuration');
+ $method = $this->getMock(
+ 'Magento\Payment\Model\MethodInterface',
+ ['getInstructions', 'getFormBlockType', 'getTitle', 'getCode'],
+ [],
+ '',
+ false
+ );
+ $method->expects($this->once())
+ ->method('getInstructions')
+ ->willReturn('payment configuration');
+ $payment->expects($this->once())
+ ->method('getMethodInstance')
+ ->willReturn($method);
+ $event->expects($this->once())
+ ->method('getPayment')
+ ->willReturn($payment);
+ $observer->expects($this->once())
+ ->method('getEvent')
+ ->willReturn($event);
+ $this->_model->beforeOrderPaymentSave($observer);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/PurchaseorderTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/PurchaseorderTest.php
new file mode 100644
index 00000000000..fb08707e9e4
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/PurchaseorderTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Model;
+
+class PurchaseorderTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflinePayments\Model\Purchaseorder
+ */
+ protected $_object;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_scopeConfig;
+
+ protected function setUp()
+ {
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
+ $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
+ $this->_scopeConfig = $this->getMock(
+ 'Magento\Framework\App\Config\ScopeConfigInterface',
+ ['getValue', 'isSetFlag'],
+ [],
+ '',
+ false
+ );
+ $this->_object = $objectManagerHelper->getObject(
+ 'Magento\OfflinePayments\Model\Purchaseorder',
+ [
+ 'eventManager' => $eventManager,
+ 'paymentData' => $paymentDataMock,
+ 'scopeConfig' => $this->_scopeConfig,
+ ]
+ );
+ }
+
+ public function testAssignData()
+ {
+ $data = new \Magento\Framework\Object([
+ 'po_number' => '12345'
+ ]);
+
+ $instance = $this->getMock('Magento\Payment\Model\Info', [], [], '', false);
+ $this->_object->setData('info_instance', $instance);
+ $this->_object->assignData($data);
+ }
+}
--
GitLab
From 7ee2df5b8a55ed3bad5029359d4b17daa1eb0c3d Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Tue, 20 Jan 2015 13:01:26 +0200
Subject: [PATCH 085/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- Moved tests to correct repo
---
.../DownloadableTaxCalculationTest.php | 72 -------------------
.../DownloadableTaxCalculationTest/test.csv | 7 --
.../Downloadable/Test/etc/scenario.xml | 37 ----------
.../app/Magento/Tax/Test/etc/scenario.xml | 37 ----------
4 files changed, 153 deletions(-)
delete mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
delete mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
delete mode 100644 dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
delete mode 100644 dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
deleted file mode 100644
index c810efd7795..00000000000
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Downloadable\Test\TestCase;
-
-use Mtf\TestCase\Scenario;
-
-/**
- * Test tax calculation with downloadable product.
- *
- * Test Flow:
- * Steps:
- * 1. Log in as default admin user.
- * 2. Go to Stores > Taxes > Tax Rules.
- * 3. Click 'Add New Tax Rule' button.
- * 4. Assign default rates to rule.
- * 5. Save Tax Rate.
- * 6. Go to Products > Catalog.
- * 7. Add new product.
- * 8. Fill data according to dataset.
- * 9. Save product.
- * 10. Go to Stores > Configuration.
- * 11. Fill Tax configuration according to data set.
- * 12. Save tax configuration.
- * 13. Perform all assertions.
- *
- * @group Tax_(CS)
- * @ZephyrId MAGETWO-32076
- */
-class DownloadableTaxCalculationTest extends Scenario
-{
- /**
- * Skip failed tests.
- *
- * @return void
- */
- public static function setUpBeforeClass()
- {
- self::markTestIncomplete("Epic: MAGETWO-30073");
- }
-
- /**
- * Runs tax calculation test.
- *
- * @return void
- */
- public function test()
- {
- $this->executeScenario();
- }
-
- /**
- * Tear down after each test.
- *
- * @return void
- */
- public function tearDown()
- {
- $this->objectManager->create('\Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep')->run();
- $this->objectManager->create('\Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
- $this->objectManager->create('\Magento\CatalogRule\Test\TestStep\DeleteAllCatalogRulesStep')->run();
-
- // TODO: Move set default configuration to "tearDownAfterClass" method after fix bug MAGETWO-29331
- $this->objectManager->create(
- 'Magento\Core\Test\TestStep\SetupConfigurationStep',
- ['configData' => 'default_tax_configuration']
- )->run();
- }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
deleted file mode 100644
index c8778e2a9f0..00000000000
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DownloadableTaxCalculationTest/test.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"description";"configData";"product";"salesRule";"catalogRule";"taxRule";"customer/dataSet";"qty";"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_price_excl_tax";"prices/cart_item_price_incl_tax";"prices/cart_item_subtotal_excl_tax";"prices/cart_item_subtotal_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";"issue"
-"Downloadable product with sales rule, customer tax equals store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_equals_store_rate";"johndoe_unique";"-";"20.00";"21.65";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"23.00";"24.90";"12.45";"";"";"0.87";"10.55";"11.42";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
-"Downloadable product with catalog rule, customer tax greater than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_incl";"downloadableProductInjectable::with_two_separately_links_special_price_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"";"16.26";"";"19.51";"";"19.51";"";"19.51";"";"19.51";"";"";"";"1.51";"18.00";"19.51";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
-"Downloadable product with sales rule, customer tax less than store tax and catalog price excluding tax";"total_cat_excl_ship_incl_after_disc_on_incl_disp_excl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"20.00";"";"23.00";"";"23.00";"";"23.00";"";"23.00";"";"12.45";"";"";"0.87";"11.42";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";""
-"Downloadable product with catalog rule, customer tax greater than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl_incl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_greater_store_rate";"johndoe_unique";"-";"9.24";"10.01";"12.01";"13.01";"12.01";"13.02";"12.01";"13.02";"12.01";"13.02";"";"";"";"1.01";"12.01";"13.02";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingIncludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax, assertOrderTaxOnBackendExcludingIncludingTax";"MAGETWO-32057"
-"Downloadable product with sales rule, customer tax less than store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_incl";"downloadableProductInjectable::with_two_separately_links_group_price_and_category";"active_sales_rule_for_all_groups_no_coupon";"-";"customer_less_store_rate";"johndoe_unique";"-";"";"19.98";"";"22.98";"";"22.97";"";"22.97";"";"22.97";"10.61";"";"";"1.75";"10.61";"12.36";"assertTaxRuleIsAppliedToAllPricesDownloadableIncludingTax, assertTaxCalculationAfterCheckoutDownloadableIncludingTax, assertOrderTaxOnBackendIncludingTax";""
-"Downloadable product with catalog rule, customer tax equals store tax and catalog price including tax";"total_cat_incl_ship_excl_before_disc_on_excl_disp_excl";"downloadableProductInjectable::with_two_separately_links_custom_options_and_category";"-";"catalog_price_rule_all_groups";"customer_equals_store_rate";"johndoe_unique";"-";"9.24";"";"12.01";"";"12.01";"";"12.01";"";"12.01";"";"";"";"";"0.99";"13.00";"";"assertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax, assertTaxCalculationAfterCheckoutDownloadableExcludingTax, assertOrderTaxOnBackendExcludingTax";"MAGETWO-32057"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
deleted file mode 100644
index d5d21016c52..00000000000
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/scenario.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
- <scenario name="DownloadableTaxCalculationTest" module="Magento_Downloadable">
- <methods>
- <method name="test">
- <steps>
- <first>setupConfiguration</first>
- <step name="setupConfiguration" module="Magento_Core">
- <next>createSalesRule</next>
- </step>
- <step name="createSalesRule" module="Magento_SalesRule">
- <next>createCatalogRule</next>
- </step>
- <step name="createCatalogRule" module="Magento_CatalogRule">
- <next>createTaxRule</next>
- </step>
- <step name="createTaxRule" module="Magento_Tax">
- <next>createProduct</next>
- </step>
- <step name="createProduct" module="Magento_Catalog">
- <next>createCustomer</next>
- </step>
- <step name="createCustomer" module="Magento_Customer">
- <next>loginCustomerOnFrontend</next>
- </step>
- <step name="loginCustomerOnFrontend" module="Magento_Customer" />
- </steps>
- </method>
- </methods>
- </scenario>
-</scenarios>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
deleted file mode 100644
index 356993adf01..00000000000
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/scenario.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
- <scenario name="TaxCalculationTest" module="Magento_Checkout">
- <methods>
- <method name="test">
- <steps>
- <first>setupConfiguration</first>
- <step name="setupConfiguration" module="Magento_Core">
- <next>createSalesRule</next>
- </step>
- <step name="createSalesRule" module="Magento_SalesRule">
- <next>createCatalogRule</next>
- </step>
- <step name="createCatalogRule" module="Magento_CatalogRule">
- <next>createTaxRule</next>
- </step>
- <step name="createTaxRule" module="Magento_Tax">
- <next>createProduct</next>
- </step>
- <step name="createProduct" module="Magento_Catalog">
- <next>createCustomer</next>
- </step>
- <step name="createCustomer" module="Magento_Customer">
- <next>loginCustomerOnFrontend</next>
- </step>
- <step name="loginCustomerOnFrontend" module="Magento_Customer" />
- </steps>
- </method>
- </methods>
- </scenario>
-</scenarios>
--
GitLab
From a45d7fda27de848b9458fdf4315460a0ae270fa0 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 13:21:47 +0200
Subject: [PATCH 086/120] MAGETWO-32081: MTF Alternative Web Driver pull
request preparation
---
dev/tests/functional/lib/Mtf/ObjectManagerFactory.php | 7 ++++---
.../Newsletter/Test/Constraint/AssertNewsletterPreview.php | 7 +++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
index 6197bea9c10..5c5a96fc093 100644
--- a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
+++ b/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
@@ -74,11 +74,12 @@ class ObjectManagerFactory
\Magento\Framework\App\Filesystem\DirectoryList $directoryList,
array $arguments
) {
+ $data = isset($arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE])
+ ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
+ : null;
return new \Magento\Framework\App\DeploymentConfig(
new \Magento\Framework\App\DeploymentConfig\Reader($directoryList),
- isset($arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE])
- ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
- : null
+ $data
);
}
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 0aa7d065d9d..5258ef9ba3c 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
@@ -29,8 +29,11 @@ class AssertNewsletterPreview extends AbstractConstraint
* @param Template $newsletter
* @return void
*/
- public function processAssert(BrowserInterfaceInterface $browser, TemplatePreview $templatePreview, Template $newsletter)
- {
+ public function processAssert(
+ BrowserInterface $browser,
+ TemplatePreview $templatePreview,
+ Template $newsletter
+ ) {
$browser->selectWindow();
$content = $templatePreview->getContent()->getPageContent();
$browser->closeWindow();
--
GitLab
From fabe2ff686a74912a042b37821c8596419f78dbf Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 13:42:27 +0200
Subject: [PATCH 087/120] MAGETWO-32081: MTF Alternative Web Driver pull
request preparation
---
dev/tests/functional/composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index aaa0e1d19c1..88ba1077889 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
{
"require": {
- "magento/mtf": "1.0.0-rc12",
+ "magento/mtf": "1.0.0-rc13",
"php": ">=5.4.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
--
GitLab
From 7d7d9e32cbfa88e7f6085f9cb646bd84dada3d3c Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 16 Jan 2015 17:18:43 +0200
Subject: [PATCH 088/120] MAGETWO-31363: Unit and Integration tests coverage
---
.../Model/Config/Backend/Tablerate.php | 4 +-
.../Model/Observer/SalesRule/ActionsTab.php | 32 ++---
.../Adminhtml/Carrier/Tablerate/GridTest.php | 126 ++++++++++++++++++
.../Model/Config/Source/TablerateTest.php | 47 +++++++
.../Observer/SalesRule/ActionsTabTest.php | 18 ++-
.../Checkout/Block/Cart/ShippingTest.php | 2 +-
6 files changed, 211 insertions(+), 18 deletions(-)
create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
diff --git a/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
index 6056d7dbbb7..c0b311a1073 100644
--- a/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
@@ -46,6 +46,8 @@ class Tablerate extends \Magento\Framework\App\Config\Value
*/
public function afterSave()
{
- $this->_tablerateFactory->create()->uploadAndImport($this);
+ /** @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate $tableRate */
+ $tableRate = $this->_tablerateFactory->create();
+ $tableRate->uploadAndImport($this);
}
}
diff --git a/app/code/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php b/app/code/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php
index b1e56563d74..10068f3d7e5 100644
--- a/app/code/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php
+++ b/app/code/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php
@@ -24,22 +24,24 @@ class ActionsTab
$form = $observer->getForm();
foreach ($form->getElements() as $element) {
/** @var \Magento\Framework\Data\Form\Element\AbstractElement $element */
- if ($element->getId() == 'action_fieldset') {
- $element->addField(
- 'simple_free_shipping',
- 'select',
- [
- 'label' => __('Free Shipping'),
- 'title' => __('Free Shipping'),
- 'name' => 'simple_free_shipping',
- 'options' => [
- 0 => __('No'),
- Rule::FREE_SHIPPING_ITEM => __('For matching items only'),
- Rule::FREE_SHIPPING_ADDRESS => __('For shipment with matching items'),
- ]
- ]
- );
+ if ($element->getId() != 'action_fieldset') {
+ continue;
}
+
+ $element->addField(
+ 'simple_free_shipping',
+ 'select',
+ [
+ 'label' => __('Free Shipping'),
+ 'title' => __('Free Shipping'),
+ 'name' => 'simple_free_shipping',
+ 'options' => [
+ 0 => __('No'),
+ Rule::FREE_SHIPPING_ITEM => __('For matching items only'),
+ Rule::FREE_SHIPPING_ADDRESS => __('For shipment with matching items'),
+ ]
+ ]
+ );
}
}
}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
new file mode 100644
index 00000000000..f569f9515dd
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate;
+
+class GridTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $storeManagerMock;
+
+ /**
+ * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $backendHelperMock;
+
+ /**
+ * @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $tablerateMock;
+
+ /**
+ * @var \Magento\Backend\Block\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $context;
+
+ /**
+ * @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $collectionFactoryMock;
+
+ protected function setUp()
+ {
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->context = $objectManager->getObject('Magento\Backend\Block\Template\Context', [
+ 'storeManager' => $this->storeManagerMock
+ ]);
+
+ $this->backendHelperMock = $this->getMockBuilder('\Magento\Backend\Helper\Data')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->collectionFactoryMock = $this->getMockBuilder('\Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->tablerateMock = $this->getMockBuilder('Magento\OfflineShipping\Model\Carrier\Tablerate')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->model = new \Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid(
+ $this->context,
+ $this->backendHelperMock,
+ $this->collectionFactoryMock,
+ $this->tablerateMock
+ );
+ }
+
+ public function testSetWebsiteId()
+ {
+ $websiteId = 1;
+
+ $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')
+ ->setMethods(['getId'])
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->storeManagerMock->expects($this->once())
+ ->method('getWebsite')
+ ->with($websiteId)
+ ->willReturn($websiteMock);
+
+ $websiteMock->expects($this->once())
+ ->method('getId')
+ ->willReturn($websiteId);
+
+ $this->assertSame($this->model, $this->model->setWebsiteId($websiteId));
+ $this->assertEquals($websiteId, $this->model->getWebsiteId());
+ }
+
+ public function testGetWebsiteId()
+ {
+ $websiteId = 10;
+
+ $websiteMock = $this->getMockBuilder('Magento\Store\Model\Website')
+ ->disableOriginalConstructor()
+ ->setMethods(['getId'])
+ ->getMock();
+
+ $websiteMock->expects($this->once())
+ ->method('getId')
+ ->willReturn($websiteId);
+
+ $this->storeManagerMock->expects($this->once())
+ ->method('getWebsite')
+ ->willReturn($websiteMock);
+
+ $this->assertEquals($websiteId, $this->model->getWebsiteId());
+
+ $this->storeManagerMock->expects($this->never())
+ ->method('getWebsite')
+ ->willReturn($websiteMock);
+
+ $this->assertEquals($websiteId, $this->model->getWebsiteId());
+ }
+
+ public function testSetAndGetConditionName()
+ {
+ $conditionName = 'someName';
+ $this->assertEquals($this->model, $this->model->setConditionName($conditionName));
+ $this->assertEquals($conditionName, $this->model->getConditionName());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
new file mode 100644
index 00000000000..8eea5073c3f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Source/TablerateTest.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflineShipping\Model\Config\Source;
+
+class TablerateTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\OfflineShipping\Model\Config\Source\Tablerate
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\OfflineShipping\Model\Carrier\Tablerate|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $carrierTablerateMock;
+
+ protected function setUp()
+ {
+ $this->carrierTablerateMock = $this->getMockBuilder('\Magento\OfflineShipping\Model\Carrier\Tablerate')
+ ->disableOriginalConstructor()
+ ->setMethods(['getCode'])
+ ->getMock();
+
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->model = $helper->getObject('Magento\OfflineShipping\Model\Config\Source\Tablerate', [
+ 'carrierTablerate' => $this->carrierTablerateMock
+ ]);
+ }
+
+ public function testToOptionArray()
+ {
+ $codes = [1, 2, 3, 4, 5];
+ $expected = [];
+ foreach ($codes as $k => $v) {
+ $expected[] = ['value' => $k, 'label' => $v];
+ }
+
+ $this->carrierTablerateMock->expects($this->once())
+ ->method('getCode')
+ ->willReturn($codes);
+
+ $this->assertEquals($expected, $this->model->toOptionArray());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
index f3ab5f5ca4f..751faf0cf82 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTabTest.php
@@ -5,6 +5,8 @@
*/
namespace Magento\OfflineShipping\Model\Observer\SalesRule;
+use Magento\OfflineShipping\Model\SalesRule\Rule;
+
class ActionsTabTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -39,7 +41,21 @@ class ActionsTabTest extends \PHPUnit_Framework_TestCase
->willReturn('action_fieldset');
$elementMock->expects($this->once())
- ->method('addField');
+ ->method('addField')
+ ->with(
+ 'simple_free_shipping',
+ 'select',
+ [
+ 'label' => __('Free Shipping'),
+ 'title' => __('Free Shipping'),
+ 'name' => 'simple_free_shipping',
+ 'options' => [
+ 0 => __('No'),
+ Rule::FREE_SHIPPING_ITEM => __('For matching items only'),
+ Rule::FREE_SHIPPING_ADDRESS => __('For shipment with matching items'),
+ ]
+ ]
+ );
$formMock->expects($this->once())
->method('getElements')
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
index 3e82bce9295..0fc0f97fbb7 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/ShippingTest.php
@@ -48,7 +48,7 @@ class ShippingTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->willReturn($scopeConfigMockReturnValue);
- $this->assertEquals($this->model->afterGetStateActive($subjectMock, $result), $assertResult);
+ $this->assertEquals($assertResult, $this->model->afterGetStateActive($subjectMock, $result));
}
public function afterGetStateActiveDataProvider()
--
GitLab
From 619125f1383f4d3da0c9f6921b9b8746ef8551e6 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Tue, 20 Jan 2015 13:54:09 +0200
Subject: [PATCH 089/120] MAGETWO-31363: Unit and Integration tests coverage
---
.../Model/Quote/FreeshippingTest.php | 178 ------------------
.../Model/SalesRule/CalculatorTest.php | 154 ++-------------
2 files changed, 13 insertions(+), 319 deletions(-)
delete mode 100644 dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
deleted file mode 100644
index 2259ed7829d..00000000000
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Quote/FreeshippingTest.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\OfflineShipping\Model\Quote;
-
-class FreeshippingTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\OfflineShipping\Model\Quote\Freeshipping|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $model;
-
- /**
- * @var \Magento\Sales\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $addressMock;
-
- /**
- * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $storeManagerMock;
-
- /**
- * @var \Magento\OfflineShipping\Model\SalesRule\Calculator|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $calculatorMock;
-
- protected function setUp()
- {
- $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-
- $this->addressMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address')
- ->disableOriginalConstructor()
- ->setMethods([
- 'getQuote',
- 'getAllItems',
- 'getFreeShipping',
- 'setFreeShipping'
- ])
- ->getMock();
-
- $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
- ->disableOriginalConstructor()
- ->getMock();
-
- $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->storeManagerMock->expects($this->once())
- ->method('getStore')
- ->willReturn($storeMock);
-
- $this->calculatorMock = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\Calculator')
- ->disableOriginalConstructor()
- ->setMethods(['init', 'processFreeShipping'])
- ->getMock();
-
- $this->model = $helper->getObject('Magento\OfflineShipping\Model\Quote\Freeshipping', [
- 'storeManager' => $this->storeManagerMock,
- 'calculator' => $this->calculatorMock
- ]);
- }
-
-
- public function testCollectWithEmptyAddressItems()
- {
- $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->addressMock->expects($this->once())
- ->method('getQuote')
- ->willReturn($quoteMock);
-
- $this->addressMock->expects($this->once())
- ->method('getAllItems')
- ->willReturn([]);
-
- $this->assertSame($this->model->collect($this->addressMock), $this->model);
- }
-
- /**
- * @dataProvider scenariosDataProvider
- * @param $isNoDiscount
- */
- public function testCollectWithAddressItems($isNoDiscount)
- {
- $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->addressMock->expects($this->once())
- ->method('getQuote')
- ->willReturn($quoteMock);
-
- $addressItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address\Item')
- ->disableOriginalConstructor()
- ->setMethods([
- 'getNoDiscount',
- 'setFreeShipping',
- 'getParentItemId',
- 'getFreeShipping',
- 'getHasChildren',
- 'isChildrenCalculated',
- 'getChildren'
- ])
- ->getMock();
-
- $this->addressMock->expects($this->once())
- ->method('getAllItems')
- ->willReturn([$addressItemMock]);
-
- $this->calculatorMock->expects($this->once())
- ->method('init');
-
- $addressItemMock->expects($this->once())
- ->method('getNoDiscount')
- ->willReturn($isNoDiscount);
-
- $addressItemMock->expects($isNoDiscount ? $this->once() : $this->never())
- ->method('setFreeShipping');
-
- $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
- ->method('getParentItemId')
- ->willReturn(false);
-
- $this->calculatorMock->expects($isNoDiscount ? $this->never() : $this->exactly(2))
- ->method('processFreeShipping');
-
- $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
- ->method('getFreeShipping')
- ->willReturn(true);
-
- $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
- ->method('getHasChildren')
- ->willReturn(true);
-
- $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
- ->method('isChildrenCalculated')
- ->willReturn(true);
-
- $childMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item\AbstractItem')
- ->disableOriginalConstructor()
- ->setMethods(['setFreeShipping', 'getQuote', 'getAddress', 'getOptionByCode'])
- ->getMock();
-
- $addressItemMock->expects($isNoDiscount ? $this->never() : $this->once())
- ->method('getChildren')
- ->willReturn([$childMock]);
-
- $childMock->expects($isNoDiscount ? $this->never() : $this->once())
- ->method('setFreeShipping');
-
- $this->addressMock->expects($isNoDiscount ? $this->never() : $this->once())
- ->method('getFreeShipping')
- ->willReturn(false);
-
- $this->addressMock->expects($isNoDiscount ? $this->once() : $this->exactly(2))
- ->method('setFreeShipping');
-
- $this->assertSame($this->model->collect($this->addressMock), $this->model);
- }
-
- public function scenariosDataProvider()
- {
- return [
- [
- true, // there is no a discount
- ],
- [
- false, // there is a discount
- ]
- ];
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
index b8e7b265792..b70631f2e42 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/SalesRule/CalculatorTest.php
@@ -5,163 +5,35 @@
*/
namespace Magento\OfflineShipping\Model\SalesRule;
-class CalculatorForTest extends Calculator
-{
- public function setValidatorUtility($validatorUtility)
- {
- $this->validatorUtility = $validatorUtility;
- }
-}
-
class CalculatorTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\OfflineShipping\Model\SalesRule\CalculatorForTest|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\SalesRule\Model\Validator|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_model;
- /**
- * @var \Magento\Sales\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $itemMock;
-
- /**
- * @var \Magento\SalesRule\Model\Utility|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $utilityMock;
-
- /**
- * @var \Magento\SalesRule\Model\Rule|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $ruleMock;
-
- /**
- * @var \Magento\Sales\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $addressMock;
-
protected function setUp()
{
- $this->utilityMock = $this->getMockBuilder('Magento\SalesRule\Model\Utility')
- ->disableOriginalConstructor()
- ->setMethods(['canProcessRule'])
- ->getMock();
-
- $this->_model = $this->getMockBuilder('Magento\OfflineShipping\Model\SalesRule\CalculatorForTest')
- ->disableOriginalConstructor()
- ->setMethods(['_getRules', '__wakeup'])
- ->getMock();
-
- $this->ruleMock = $this->getMockBuilder('Magento\SalesRule\Model\Rule')
- ->disableOriginalConstructor()
- ->setMethods(['getActions', 'getSimpleFreeShipping'])
- ->getMock();
-
- $this->addressMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Address')
- ->disableOriginalConstructor()
- ->setMethods(['setFreeShipping'])
- ->getMock();
-
- $this->_model->setValidatorUtility($this->utilityMock);
-
- $this->itemMock = $this->getMock('Magento\Sales\Model\Quote\Item', ['getAddress'], [], '', false);
-
- $this->itemMock->expects($this->once())
- ->method('getAddress')
- ->willReturn($this->addressMock);
+ $this->_model = $this->getMock(
+ 'Magento\OfflineShipping\Model\SalesRule\Calculator',
+ ['_getRules', '__wakeup'],
+ [],
+ '',
+ false
+ );
+ $this->_model->expects($this->any())->method('_getRules')->will($this->returnValue([]));
}
public function testProcessFreeShipping()
{
- $this->_model->expects($this->any())->method('_getRules')->will($this->returnValue([]));
+ $item = $this->getMock('Magento\Sales\Model\Quote\Item', ['getAddress', '__wakeup'], [], '', false);
+ $item->expects($this->once())->method('getAddress')->will($this->returnValue(true));
$this->assertInstanceOf(
'Magento\OfflineShipping\Model\SalesRule\Calculator',
- $this->_model->processFreeShipping($this->itemMock)
+ $this->_model->processFreeShipping($item)
);
- }
-
- public function testProcessFreeShippingContinueOnProcessRule()
- {
- $this->_model->expects($this->once())
- ->method('_getRules')
- ->willReturn(['rule1']);
-
- $this->utilityMock->expects($this->once())
- ->method('canProcessRule')
- ->willReturn(false);
-
- $this->_model->processFreeShipping($this->itemMock);
- }
-
- public function testProcessFreeShippingContinueOnValidateItem()
- {
- $this->utilityMock->expects($this->once())
- ->method('canProcessRule')
- ->willReturn(true);
-
- $actionsCollectionMock = $this->getMockBuilder('Magento\Rule\Model\Action\Collection')
- ->disableOriginalConstructor()
- ->setMethods(['validate'])
- ->getMock();
-
- $actionsCollectionMock->expects($this->once())
- ->method('validate')
- ->willReturn(false);
-
- $this->ruleMock->expects($this->once())
- ->method('getActions')
- ->willReturn($actionsCollectionMock);
-
- $this->_model->expects($this->once())
- ->method('_getRules')
- ->willReturn([$this->ruleMock]);
-
- $this->_model->processFreeShipping($this->itemMock);
- }
- /**
- * @dataProvider rulesDataProvider
- */
- public function testProcessFreeShippingFreeShippingItem($rule)
- {
- $this->utilityMock->expects($this->once())
- ->method('canProcessRule')
- ->willReturn(true);
-
- $actionsCollectionMock = $this->getMockBuilder('Magento\Rule\Model\Action\Collection')
- ->disableOriginalConstructor()
- ->setMethods(['validate'])
- ->getMock();
-
- $actionsCollectionMock->expects($this->once())
- ->method('validate')
- ->willReturn(true);
-
- $this->ruleMock->expects($this->once())
- ->method('getActions')
- ->willReturn($actionsCollectionMock);
-
- $this->_model->expects($this->once())
- ->method('_getRules')
- ->willReturn([$this->ruleMock]);
-
- $this->ruleMock->expects($this->once())
- ->method('getSimpleFreeShipping')
- ->willReturn($rule);
-
- $this->addressMock->expects(
- $rule == \Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ADDRESS ? $this->once() : $this->never()
- )->method('setFreeShipping');
-
- $this->_model->processFreeShipping($this->itemMock);
- }
-
- public function rulesDataProvider()
- {
- return [
- [\Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ITEM],
- [\Magento\OfflineShipping\Model\SalesRule\Rule::FREE_SHIPPING_ADDRESS]
- ];
+ return true;
}
}
--
GitLab
From cd513901f381079b947308905bf3e813e1b34138 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 14:37:25 +0200
Subject: [PATCH 090/120] MAGETWO-32081: MTF Alternative Web Driver pull
request preparation
---
dev/tests/functional/lib/Mtf/Client/Element/Tree.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
index 77d9808e689..499a7d645fd 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
@@ -45,6 +45,7 @@ abstract class Tree extends SimpleElement
*
* @param ElementInterface $target
* @throws \Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function dragAndDrop(ElementInterface $target)
{
--
GitLab
From 3f6dc1dd5204cae39c90697f34473ce40aa572de Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 15:25:36 +0200
Subject: [PATCH 091/120] MAGETWO-32081: Magento vendor name is used as a home
framework directory
---
dev/tests/functional/.gitignore | 2 +-
dev/tests/functional/composer.json | 3 +-
dev/tests/functional/composer.json.dist | 6 ++-
dev/tests/functional/etc/global/di.xml | 4 +-
.../Mtf/App/State/AbstractState.php | 4 +-
.../{ => Magento}/Mtf/App/State/State1.php | 6 +--
.../Mtf/Client/Element/ConditionsElement.php | 8 +--
.../Mtf/Client/Element/DatepickerElement.php | 4 +-
.../Client/Element/GlobalsearchElement.php | 6 +--
.../Mtf/Client/Element/JquerytreeElement.php | 4 +-
.../Client/Element/LiselectstoreElement.php | 4 +-
.../Element/MultiselectgrouplistElement.php | 6 +--
.../Client/Element/MultiselectlistElement.php | 10 ++--
.../Client/Element/MultisuggestElement.php | 6 +--
.../Client/Element/OptgroupselectElement.php | 4 +-
.../Mtf/Client/Element/SelectstoreElement.php | 4 +-
.../Mtf/Client/Element/SuggestElement.php | 4 +-
.../{ => Magento}/Mtf/Client/Element/Tree.php | 4 +-
.../Mtf/Client/Element/TreeElement.php | 2 +-
.../Mtf/Constraint/AbstractAssertForm.php | 2 +-
.../Mtf/EntryPoint/EntryPoint.php | 6 +--
.../Mtf/ObjectManagerFactory.php | 52 +++++++++----------
.../{ => Magento}/Mtf/Page/BackendPage.php | 4 +-
.../Mtf/Util/Generate/Factory.php | 2 +-
.../Util/Generate/Factory/AbstractFactory.php | 16 +++---
.../Mtf/Util/Generate/Factory/Block.php | 2 +-
.../Mtf/Util/Generate/Factory/Fixture.php | 2 +-
.../Mtf/Util/Generate/Factory/Handler.php | 2 +-
.../Mtf/Util/Generate/Factory/Page.php | 2 +-
.../Mtf/Util/Generate/Factory/Repository.php | 2 +-
.../Util/Generate/Fixture/FieldsProvider.php | 2 +-
.../Repository/CollectionProvider.php | 4 +-
.../Mtf/Util/Generate/Repository/Resource.php | 2 +-
.../Generate/Repository/TableCollection.php | 6 +--
.../Mtf/Util/Protocol/CurlInterface.php | 2 +-
.../Mtf/Util/Protocol/CurlTransport.php | 2 +-
.../CurlTransport/BackendDecorator.php | 8 +--
.../CurlTransport/FrontendDecorator.php | 6 +--
.../Mtf/Util/Protocol/SoapTransport.php | 2 +-
dev/tests/functional/phpunit.xml.dist | 10 ++--
.../Backend/Test/Block/Admin/Login.php | 4 +-
.../app/Magento/Backend/Test/Block/Cache.php | 6 +--
.../app/Magento/Backend/Test/Block/Denied.php | 4 +-
.../Backend/Test/Block/FormPageActions.php | 2 +-
.../app/Magento/Backend/Test/Block/Menu.php | 2 +-
.../Backend/Test/Block/Page/Header.php | 6 +--
.../Magento/Backend/Test/Block/Page/Main.php | 2 +-
.../Backend/Test/Block/PageActions.php | 2 +-
.../Backend/Test/Block/System/Config/Form.php | 6 +--
.../Test/Block/System/Config/Form/Group.php | 2 +-
.../Test/Block/System/Config/PageActions.php | 2 +-
.../Test/Block/System/Store/Delete/Form.php | 4 +-
.../System/Store/Edit/Form/GroupForm.php | 4 +-
.../System/Store/Edit/Form/StoreForm.php | 4 +-
.../System/Store/Edit/Form/WebsiteForm.php | 2 +-
.../Test/Block/System/Store/StoreGrid.php | 2 +-
.../System/Variable/Edit/VariableForm.php | 2 +-
.../Magento/Backend/Test/Block/Template.php | 2 +-
.../Backend/Test/Block/Widget/Form.php | 8 +--
.../Backend/Test/Block/Widget/FormTabs.php | 18 +++----
.../Backend/Test/Block/Widget/Grid.php | 8 +--
.../Magento/Backend/Test/Block/Widget/Tab.php | 6 +--
.../AssertGlobalSearchCustomerName.php | 2 +-
.../AssertGlobalSearchNoRecordsFound.php | 2 +-
.../Constraint/AssertGlobalSearchOrderId.php | 2 +-
.../AssertGlobalSearchProductName.php | 2 +-
.../Backend/Test/Fixture/Admin/SuperAdmin.php | 2 +-
.../app/Magento/Backend/Test/Fixture/Date.php | 2 +-
.../Backend/Test/Fixture/GlobalSearch.php | 2 +-
.../Test/Fixture/GlobalSearch/Query.php | 6 +--
.../Backend/Test/Handler/Conditions.php | 2 +-
.../Backend/Test/Handler/Extractor.php | 8 +--
.../Backend/Test/Handler/Ui/LoginUser.php | 6 +--
.../Backend/Test/Handler/Ui/LogoutUser.php | 6 +--
.../Backend/Test/Page/AdminAuthLogin.php | 6 +--
.../Test/Constraint/AssertBackupInGrid.php | 2 +-
.../Catalog/Product/Edit/Tab/Bundle.php | 4 +-
.../Product/Edit/Tab/Bundle/Option.php | 4 +-
.../Edit/Tab/Bundle/Option/Selection.php | 2 +-
.../Adminhtml/Product/Composite/Configure.php | 2 +-
.../Test/Block/Catalog/Product/View.php | 6 +--
.../Catalog/Product/View/Type/Bundle.php | 10 ++--
.../Catalog/Product/View/Type/Option.php | 2 +-
.../Constraint/AssertBundleInCategory.php | 2 +-
.../AssertBundleItemsOnProductPage.php | 4 +-
.../Test/Constraint/AssertBundlePriceType.php | 4 +-
.../Test/Constraint/AssertBundlePriceView.php | 4 +-
...ProductInCustomerWishlistOnBackendGrid.php | 2 +-
.../AssertGroupedPriceOnBundleProductPage.php | 2 +-
.../AssertTierPriceOnBundleProductPage.php | 4 +-
.../Magento/Bundle/Test/Fixture/Bundle.php | 4 +-
.../Bundle/Test/Fixture/BundleDynamic.php | 2 +-
.../Bundle/Test/Fixture/BundleFixed.php | 2 +-
.../Bundle/Test/Fixture/BundleProduct.php | 12 ++---
.../BundleProduct/BundleSelections.php | 4 +-
.../Test/Fixture/BundleProduct/Price.php | 2 +-
.../Magento/Bundle/Test/Fixture/Cart/Item.php | 2 +-
.../BundleProduct/BundleProductInterface.php | 2 +-
.../Test/Handler/BundleProduct/Curl.php | 4 +-
.../Bundle/Test/Handler/Curl/CreateBundle.php | 12 ++---
.../Bundle/Test/Repository/BundleProduct.php | 2 +-
.../Test/TestCase/BundleDynamicTest.php | 4 +-
.../Bundle/Test/TestCase/BundleFixedTest.php | 4 +-
.../CreateBundleProductEntityTest.php | 2 +-
.../Bundle/Test/TestCase/EditBundleTest.php | 4 +-
.../UpdateBundleProductEntityTest.php | 2 +-
.../Test/Block/AbstractConfigureBlock.php | 6 +--
.../Adminhtml/Category/Edit/CategoryForm.php | 2 +-
.../Adminhtml/Category/Edit/Tab/Product.php | 2 +-
.../Test/Block/Adminhtml/Category/Tree.php | 10 ++--
.../Adminhtml/Category/Widget/Chooser.php | 4 +-
.../Product/Attribute/AttributeForm.php | 8 +--
.../Product/Attribute/CustomAttribute.php | 4 +-
.../Product/Attribute/Edit/AttributeForm.php | 10 ++--
.../Product/Attribute/Edit/Options.php | 4 +-
.../Product/Attribute/Edit/Tab/Advanced.php | 4 +-
.../Product/Attribute/Edit/Tab/Options.php | 4 +-
.../Attribute/Edit/Tab/Options/Option.php | 2 +-
.../Adminhtml/Product/Attribute/Set/Main.php | 4 +-
.../Attribute/Set/Main/AttributeSetForm.php | 2 +-
.../Product/Attribute/Set/Main/EditForm.php | 2 +-
.../Adminhtml/Product/Composite/Configure.php | 6 +--
.../Product/Edit/Action/Attribute.php | 2 +-
.../Product/Edit/AdvancedPricingTab.php | 2 +-
.../Edit/AdvancedPricingTab/OptionGroup.php | 2 +-
.../Edit/AdvancedPricingTab/OptionTier.php | 2 +-
.../Adminhtml/Product/Edit/ProductTab.php | 2 +-
.../Product/Edit/Tab/AbstractRelated.php | 2 +-
.../Product/Edit/Tab/Attributes/Search.php | 2 +-
.../Adminhtml/Product/Edit/Tab/Crosssell.php | 2 +-
.../Adminhtml/Product/Edit/Tab/Options.php | 6 +--
.../Edit/Tab/Options/AbstractOptions.php | 2 +-
.../Edit/Tab/Options/Type/DropDown.php | 2 +-
.../Product/Edit/Tab/ProductDetails.php | 4 +-
.../Edit/Tab/ProductDetails/AttributeSet.php | 2 +-
.../Edit/Tab/ProductDetails/CategoryIds.php | 4 +-
.../ProductDetails/ProductOnlineSwitcher.php | 4 +-
.../Adminhtml/Product/Edit/Tab/Related.php | 2 +-
.../Adminhtml/Product/Edit/Tab/Upsell.php | 2 +-
.../Product/Edit/Tab/Websites/StoreTree.php | 4 +-
.../Adminhtml/Product/FormPageActions.php | 4 +-
.../Adminhtml/Product/GridPageAction.php | 2 +-
.../Block/Adminhtml/Product/ProductForm.php | 12 ++---
.../Test/Block/Category/ProductPagination.php | 4 +-
.../Catalog/Test/Block/Category/View.php | 4 +-
.../Catalog/Test/Block/Product/Additional.php | 8 +--
.../Block/Product/Compare/ListCompare.php | 6 +--
.../Product/Grouped/AssociatedProducts.php | 8 +--
.../ListAssociatedProducts.php | 8 +--
.../ListAssociatedProducts/Product.php | 2 +-
.../Test/Block/Product/ListProduct.php | 8 +--
.../Catalog/Test/Block/Product/Price.php | 6 +--
.../Product/ProductList/BottomToolbar.php | 2 +-
.../Block/Product/ProductList/Crosssell.php | 8 +--
.../Block/Product/ProductList/Related.php | 6 +--
.../Block/Product/ProductList/TopToolbar.php | 2 +-
.../Test/Block/Product/ProductList/Upsell.php | 6 +--
.../Catalog/Test/Block/Product/View.php | 6 +--
.../Test/Block/Product/View/CustomOptions.php | 10 ++--
.../app/Magento/Catalog/Test/Block/Search.php | 4 +-
.../AssertAbsenceDeleteAttributeButton.php | 2 +-
.../AssertAddToCartButtonAbsent.php | 2 +-
.../AssertAddToCartButtonPresent.php | 2 +-
...sertAddedProductAttributeOnProductForm.php | 6 +--
.../Test/Constraint/AssertAttributeForm.php | 2 +-
.../AssertAttributeOptionsOnProductForm.php | 2 +-
.../AssertAttributeSearchableByLabel.php | 2 +-
.../AssertCategoryAbsenceOnBackend.php | 2 +-
.../AssertCategoryAbsenceOnFrontend.php | 4 +-
.../AssertCategoryForAssignedProducts.php | 4 +-
.../Test/Constraint/AssertCategoryForm.php | 2 +-
.../Constraint/AssertCategoryIsNotActive.php | 4 +-
.../AssertCategoryIsNotIncludeInMenu.php | 4 +-
.../Test/Constraint/AssertCategoryPage.php | 6 +--
.../Constraint/AssertCategoryRedirect.php | 4 +-
.../Constraint/AssertCategorySaveMessage.php | 2 +-
.../AssertCategorySuccessDeleteMessage.php | 2 +-
.../AssertCrossSellsProductsSection.php | 6 +--
.../AssertNoCrossSellsProductsSection.php | 6 +--
.../AssertNoRelatedProductsSection.php | 6 +--
.../AssertNoUpSellsProductsSection.php | 6 +--
.../AssertPriceOnProductPageInterface.php | 2 +-
.../AssertProductAttributeAbsenceInGrid.php | 2 +-
...tAttributeAbsenceInSearchOnProductForm.php | 2 +-
...roductAttributeAbsenceInTemplateGroups.php | 2 +-
...AttributeAbsenceInUnassignedAttributes.php | 2 +-
...rtProductAttributeDisplayingOnFrontend.php | 6 +--
...ProductAttributeDisplayingOnSearchForm.php | 2 +-
.../AssertProductAttributeInGrid.php | 2 +-
.../AssertProductAttributeIsComparable.php | 6 +--
.../AssertProductAttributeIsFilterable.php | 6 +--
...rtProductAttributeIsFilterableInSearch.php | 4 +-
.../AssertProductAttributeIsGlobal.php | 2 +-
.../AssertProductAttributeIsHtmlAllowed.php | 6 +--
.../AssertProductAttributeIsRequired.php | 4 +-
.../AssertProductAttributeIsUnique.php | 4 +-
...ProductAttributeIsUsedInSortOnFrontend.php | 4 +-
...AssertProductAttributeIsUsedPromoRules.php | 2 +-
.../AssertProductAttributeSaveMessage.php | 2 +-
...rtProductAttributeSuccessDeleteMessage.php | 2 +-
.../AssertProductCompareBlockOnCmsPage.php | 6 +--
.../AssertProductCompareItemsLink.php | 2 +-
.../AssertProductCompareItemsLinkIsAbsent.php | 2 +-
.../Constraint/AssertProductComparePage.php | 2 +-
...ProductCompareRemoveLastProductMessage.php | 2 +-
.../AssertProductCompareSuccessAddMessage.php | 4 +-
...CompareSuccessRemoveAllProductsMessage.php | 2 +-
...sertProductCompareSuccessRemoveMessage.php | 4 +-
...ssertProductCustomOptionsOnProductPage.php | 6 +--
.../Constraint/AssertProductDuplicateForm.php | 2 +-
...ductDuplicateIsNotDisplayingOnFrontend.php | 2 +-
.../AssertProductDuplicateMessage.php | 2 +-
.../AssertProductDuplicatedInGrid.php | 4 +-
.../Test/Constraint/AssertProductForm.php | 4 +-
...AssertProductGroupedPriceOnProductPage.php | 6 +--
.../Test/Constraint/AssertProductInCart.php | 6 +--
.../Constraint/AssertProductInCategory.php | 4 +-
.../Test/Constraint/AssertProductInGrid.php | 4 +-
.../Test/Constraint/AssertProductInStock.php | 6 +--
...AssertProductIsNotDisplayingOnFrontend.php | 6 +--
...ssertProductIsNotVisibleInCompareBlock.php | 4 +-
...AssertProductIsNotVisibleInComparePage.php | 4 +-
.../Constraint/AssertProductNotInGrid.php | 4 +-
.../AssertProductNotSearchableBySku.php | 4 +-
.../AssertProductNotVisibleInCategory.php | 4 +-
.../Constraint/AssertProductOutOfStock.php | 6 +--
.../Test/Constraint/AssertProductPage.php | 6 +--
.../Constraint/AssertProductSaveMessage.php | 2 +-
.../AssertProductSearchableBySku.php | 4 +-
.../AssertProductSkuAutoGenerated.php | 4 +-
...AssertProductSpecialPriceOnProductPage.php | 6 +--
.../AssertProductSuccessDeleteMessage.php | 4 +-
.../Constraint/AssertProductTemplateForm.php | 2 +-
...ssertProductTemplateGroupOnProductForm.php | 6 +--
.../AssertProductTemplateInGrid.php | 2 +-
.../AssertProductTemplateNotInGrid.php | 2 +-
.../AssertProductTemplateOnProductForm.php | 4 +-
...ertProductTemplateSuccessDeleteMessage.php | 2 +-
...ssertProductTemplateSuccessSaveMessage.php | 2 +-
.../AssertProductTierPriceOnProductPage.php | 6 +--
.../Test/Constraint/AssertProductView.php | 4 +-
.../AssertProductVisibleInCategory.php | 4 +-
.../AssertRelatedProductsSection.php | 6 +--
.../AssertUpSellsProductsSection.php | 8 +--
...SuperAttributeImpossibleDeleteMessages.php | 2 +-
.../Catalog/Test/Fixture/AssignProducts.php | 4 +-
.../Catalog/Test/Fixture/Cart/Item.php | 2 +-
.../Test/Fixture/CatalogAttributeSet.php | 2 +-
.../AssignedAttributes.php | 4 +-
.../CatalogAttributeSet/SkeletonSet.php | 4 +-
.../Test/Fixture/CatalogProductAttribute.php | 2 +-
.../CatalogProductAttribute/Options.php | 2 +-
.../Test/Fixture/CatalogProductSimple.php | 12 ++---
.../AbstractRelatedProducts.php | 4 +-
.../CatalogProductSimple/AttributeSetId.php | 4 +-
.../CatalogProductSimple/CategoryIds.php | 4 +-
.../CatalogProductSimple/CheckoutData.php | 2 +-
.../CatalogProductSimple/CustomAttribute.php | 4 +-
.../CatalogProductSimple/CustomOptions.php | 4 +-
.../Test/Fixture/CatalogProductSimple/Fpt.php | 2 +-
.../GroupPriceOptions.php | 6 +--
.../Fixture/CatalogProductSimple/Price.php | 4 +-
.../Fixture/CatalogProductSimple/TaxClass.php | 12 ++---
.../CatalogProductSimple/TierPriceOptions.php | 2 +-
.../Test/Fixture/CatalogProductVirtual.php | 12 ++---
.../Magento/Catalog/Test/Fixture/Category.php | 2 +-
.../Fixture/Category/CategoryProducts.php | 4 +-
.../Test/Fixture/Category/LandingPage.php | 4 +-
.../Test/Fixture/Category/ParentId.php | 4 +-
.../Test/Fixture/CrosssellProducts.php | 2 +-
.../Magento/Catalog/Test/Fixture/Product.php | 8 +--
.../Catalog/Test/Fixture/ProductAttribute.php | 6 +--
.../Catalog/Test/Fixture/SimpleProduct.php | 4 +-
.../Catalog/Test/Fixture/VirtualProduct.php | 2 +-
.../CatalogAttributeSetInterface.php | 2 +-
.../Test/Handler/CatalogAttributeSet/Curl.php | 12 ++---
.../CatalogProductAttributeInterface.php | 2 +-
.../Handler/CatalogProductAttribute/Curl.php | 12 ++---
.../CatalogProductSimpleInterface.php | 2 +-
.../Handler/CatalogProductSimple/Curl.php | 12 ++---
.../Test/Handler/CatalogProductSimple/Ui.php | 6 +--
.../CatalogProductVirtualInterface.php | 2 +-
.../Handler/Category/CategoryInterface.php | 2 +-
.../Catalog/Test/Handler/Category/Curl.php | 12 ++---
.../Test/Handler/Curl/CreateProduct.php | 14 ++---
.../Handler/Curl/CreateProductAttribute.php | 12 ++---
.../Catalog/Test/Handler/Ui/CreateProduct.php | 6 +--
.../Test/Page/Category/CatalogCategory.php | 6 +--
.../Page/Category/CatalogCategoryEdit.php | 6 +--
.../CatalogProductActionAttributeEdit.php | 6 +--
.../Test/Repository/AssignProducts.php | 2 +-
.../Test/Repository/CatalogAttributeSet.php | 2 +-
.../Repository/CatalogProductAttribute.php | 2 +-
.../Test/Repository/CatalogProductSimple.php | 2 +-
.../Test/Repository/CatalogProductVirtual.php | 2 +-
.../Catalog/Test/Repository/Category.php | 2 +-
.../Catalog/Test/Repository/Product.php | 2 +-
.../Test/Repository/ProductAttribute.php | 2 +-
.../Category/CreateCategoryEntityTest.php | 2 +-
.../Category/DeleteCategoryEntityTest.php | 2 +-
.../Category/UpdateCategoryEntityTest.php | 2 +-
.../AbstractAddRelatedProductsEntityTest.php | 6 +--
.../Product/AbstractCompareProductsTest.php | 10 ++--
.../TestCase/Product/CreateProductTest.php | 4 +-
.../Product/CreateSimpleProductEntityTest.php | 2 +-
.../Product/CreateSimpleWithCategoryTest.php | 4 +-
...SimpleWithCustomOptionsAndCategoryTest.php | 4 +-
.../Test/TestCase/Product/CreateTest.php | 4 +-
.../CreateVirtualProductEntityTest.php | 2 +-
.../TestCase/Product/CreateVirtualTest.php | 4 +-
.../Test/TestCase/Product/CrosssellTest.php | 4 +-
.../Product/EditSimpleProductTest.php | 4 +-
.../ProductTypeSwitchingOnCreationTest.php | 4 +-
.../ProductTypeSwitchingOnUpdateTest.php | 4 +-
.../TestCase/Product/RelatedProductTest.php | 4 +-
.../TestCase/Product/UnassignCategoryTest.php | 4 +-
.../Product/UpdateSimpleProductEntityTest.php | 4 +-
.../UpdateVirtualProductEntityTest.php | 4 +-
.../Test/TestCase/Product/UpsellTest.php | 4 +-
.../CreateAttributeSetEntityTest.php | 2 +-
...ductAttributeEntityFromProductPageTest.php | 6 +--
.../CreateProductAttributeEntityTest.php | 4 +-
...AssignedToTemplateProductAttributeTest.php | 2 +-
.../DeleteAttributeSetTest.php | 4 +-
.../DeleteProductAttributeEntityTest.php | 2 +-
.../DeleteSystemProductAttributeTest.php | 2 +-
...UsedInConfigurableProductAttributeTest.php | 2 +-
.../UpdateAttributeSetTest.php | 2 +-
.../UpdateProductAttributeEntityTest.php | 2 +-
.../AddAttributeToProductTemplateStep.php | 4 +-
.../AddNewAttributeFromProductPageStep.php | 2 +-
.../Test/TestStep/AddNewAttributeStep.php | 2 +-
.../Test/TestStep/CreateProductStep.php | 6 +--
.../TestStep/CreateProductTemplateStep.php | 2 +-
.../Test/TestStep/CreateProductsStep.php | 6 +--
.../Test/TestStep/DeleteAttributeStep.php | 2 +-
.../FillAttributeFormOnProductPageStep.php | 2 +-
.../Test/TestStep/FillAttributeFormStep.php | 2 +-
.../OpenProductAttributesPageStep.php | 2 +-
.../TestStep/OpenProductOnBackendStep.php | 4 +-
.../TestStep/OpenProductsOnFrontendStep.php | 4 +-
.../SaveAttributeOnProductPageStep.php | 2 +-
.../Test/TestStep/SaveAttributeStep.php | 2 +-
.../Catalog/Test/TestStep/SaveProductStep.php | 4 +-
.../Test/TestStep/SaveProductTemplateStep.php | 2 +-
.../TestStep/SetDefaultAttributeValueStep.php | 4 +-
.../Magento/Catalog/Test/etc/constraint.xml | 42 +++++++--------
.../app/Magento/Catalog/Test/etc/scenario.xml | 2 +-
.../Test/Block/Adminhtml/Promo/Catalog.php | 4 +-
.../Promo/Catalog/Edit/PromoForm.php | 6 +--
.../Promo/Catalog/Edit/Tab/Conditions.php | 4 +-
.../CatalogRule/Test/Block/Conditions.php | 4 +-
...sertCatalogPriceRuleAppliedCatalogPage.php | 2 +-
...sertCatalogPriceRuleAppliedProductPage.php | 2 +-
...ertCatalogPriceRuleAppliedShoppingCart.php | 2 +-
.../Constraint/AssertCatalogPriceRuleForm.php | 2 +-
.../AssertCatalogPriceRuleInGrid.php | 2 +-
.../AssertCatalogPriceRuleNotInGrid.php | 2 +-
.../AssertCatalogPriceRuleNoticeMessage.php | 2 +-
...rtCatalogPriceRuleSuccessDeleteMessage.php | 2 +-
...sertCatalogPriceRuleSuccessSaveMessage.php | 2 +-
.../Test/Fixture/CatalogPriceRule.php | 4 +-
.../CatalogRule/Test/Fixture/CatalogRule.php | 2 +-
.../Test/Fixture/CatalogRule/Conditions.php | 6 +--
.../CatalogRule/Test/Fixture/Conditions.php | 4 +-
.../Test/Fixture/Product/Category.php | 6 +--
.../CatalogRule/CatalogRuleInterface.php | 2 +-
.../Test/Handler/CatalogRule/Curl.php | 10 ++--
.../Test/Repository/CatalogPriceRule.php | 2 +-
.../Test/Repository/CatalogRule.php | 2 +-
.../AbstractCatalogRuleEntityTest.php | 4 +-
.../DeleteCatalogPriceRuleEntityTest.php | 2 +-
.../TestStep/DeleteAllCatalogRulesStep.php | 2 +-
.../Test/Block/Advanced/Form.php | 10 ++--
.../Test/Block/Advanced/Result.php | 4 +-
.../AssertAdvancedSearchProductsResult.php | 2 +-
.../Constraint/AssertCatalogSearchResult.php | 2 +-
...sertProductCanBeOpenedFromSearchResult.php | 2 +-
...rtSearchSynonymMassActionNotOnFrontend.php | 4 +-
.../AssertSearchSynonymNotOnFrontend.php | 4 +-
.../Test/Constraint/AssertSearchTermForm.php | 2 +-
.../Constraint/AssertSearchTermInGrid.php | 2 +-
...ssertSearchTermMassActionNotOnFrontend.php | 4 +-
.../AssertSearchTermMassActionsNotInGrid.php | 2 +-
.../Constraint/AssertSearchTermNotInGrid.php | 2 +-
.../AssertSearchTermNotOnFrontend.php | 4 +-
.../Constraint/AssertSearchTermOnFrontend.php | 4 +-
.../AssertSearchTermSuccessDeleteMessage.php | 2 +-
...sertSearchTermSuccessMassDeleteMessage.php | 2 +-
.../AssertSearchTermSuccessSaveMessage.php | 2 +-
.../AssertSearchTermSynonymOnFrontend.php | 4 +-
.../AssertSuggestSearchingResult.php | 2 +-
.../Test/Fixture/CatalogSearchQuery.php | 2 +-
.../Fixture/CatalogSearchQuery/QueryText.php | 6 +--
.../CatalogSearchQueryInterface.php | 2 +-
.../Test/Handler/CatalogSearchQuery/Curl.php | 12 ++---
.../Test/Repository/CatalogSearchQuery.php | 2 +-
.../TestCase/AdvancedSearchEntityTest.php | 4 +-
.../TestCase/CreateSearchTermEntityTest.php | 2 +-
.../TestCase/DeleteSearchTermEntityTest.php | 2 +-
.../TestCase/EditSearchTermEntityTest.php | 2 +-
.../MassDeleteSearchTermEntityTest.php | 4 +-
.../Test/TestCase/SearchEntityResultsTest.php | 2 +-
.../SuggestSearchingResultEntityTest.php | 2 +-
.../CatalogSearch/Test/etc/constraint.xml | 12 ++---
.../app/Magento/Checkout/Test/Block/Cart.php | 8 +--
.../Test/Block/Cart/AbstractCartItem.php | 2 +-
.../Checkout/Test/Block/Cart/CartEmpty.php | 4 +-
.../Checkout/Test/Block/Cart/CartItem.php | 2 +-
.../Test/Block/Cart/DiscountCodes.php | 4 +-
.../Checkout/Test/Block/Cart/Shipping.php | 4 +-
.../Checkout/Test/Block/Cart/Sidebar.php | 6 +--
.../Checkout/Test/Block/Cart/Totals.php | 4 +-
.../Checkout/Test/Block/Onepage/Link.php | 2 +-
...AssertAddedProductToCartSuccessMessage.php | 4 +-
.../Test/Constraint/AssertCartIsEmpty.php | 4 +-
.../Constraint/AssertCartItemsOptions.php | 4 +-
.../AssertGrandTotalInShoppingCart.php | 2 +-
.../AssertOrderSuccessPlacedMessage.php | 2 +-
.../AssertOrderTotalOnReviewPage.php | 2 +-
.../Constraint/AssertPriceInShoppingCart.php | 4 +-
.../AssertProductAbsentInMiniShoppingCart.php | 4 +-
.../Constraint/AssertProductIsNotEditable.php | 2 +-
...AssertProductPresentInMiniShoppingCart.php | 2 +-
.../AssertProductPresentInShoppingCart.php | 2 +-
.../AssertProductQtyInMiniShoppingCart.php | 4 +-
.../AssertProductQtyInShoppingCart.php | 4 +-
.../AssertProductsAbsentInShoppingCart.php | 2 +-
.../AssertSubtotalInShoppingCart.php | 4 +-
.../Magento/Checkout/Test/Fixture/Cart.php | 2 +-
.../Checkout/Test/Fixture/Cart/Items.php | 4 +-
.../AddProductsToShoppingCartEntityTest.php | 8 +--
.../DeleteProductFromMiniShoppingCartTest.php | 8 +--
.../DeleteProductsFromShoppingCartTest.php | 10 ++--
...eProductFromMiniShoppingCartEntityTest.php | 6 +--
.../Test/TestCase/UpdateShoppingCartTest.php | 6 +--
.../TestStep/AddProductsToTheCartStep.php | 4 +-
.../TestStep/FillBillingInformationStep.php | 2 +-
.../Test/TestStep/FillShippingMethodStep.php | 2 +-
.../Checkout/Test/TestStep/PlaceOrderStep.php | 2 +-
.../Test/TestStep/ProceedToCheckoutStep.php | 2 +-
.../TestStep/SelectCheckoutMethodStep.php | 2 +-
.../Test/TestStep/SelectPaymentMethodStep.php | 2 +-
.../Magento/Checkout/Test/etc/scenario.xml | 2 +-
.../Handler/CmsBlock/CmsBlockInterface.php | 2 +-
.../Cms/Test/Handler/CmsBlock/Curl.php | 12 ++---
.../Test/Handler/CmsPage/CmsPageInterface.php | 2 +-
.../Magento/Cms/Test/Handler/CmsPage/Curl.php | 10 ++--
.../Product/AffectedAttributeSet.php | 8 +--
.../Adminhtml/Product/Composite/Configure.php | 2 +-
.../Product/Edit/Tab/Super/Config.php | 6 +--
.../Edit/Tab/Super/Config/Attribute.php | 4 +-
.../Config/Attribute/AttributeSelector.php | 2 +-
.../Super/Config/Attribute/ToggleDropdown.php | 4 +-
.../Product/Edit/Tab/Super/Config/Matrix.php | 4 +-
.../Adminhtml/Product/FormPageActions.php | 4 +-
.../Block/Adminhtml/Product/ProductForm.php | 10 ++--
.../Test/Block/Product/View.php | 4 +-
.../Product/View/ConfigurableOptions.php | 10 ++--
...rtChildProductIsNotDisplayedSeparately.php | 2 +-
.../Constraint/AssertChildProductsInGrid.php | 2 +-
...figurableAttributesAbsentOnProductPage.php | 4 +-
...leAttributesBlockIsAbsentOnProductPage.php | 4 +-
...AssertConfigurableProductDuplicateForm.php | 2 +-
.../AssertConfigurableProductInCart.php | 4 +-
...ProductInCustomerWishlistOnBackendGrid.php | 2 +-
...tConfigurableProductInItemsOrderedGrid.php | 2 +-
...ductAttributeAbsenceInVariationsSearch.php | 2 +-
.../AssertProductAttributeIsConfigurable.php | 2 +-
.../Test/Fixture/Cart/Item.php | 2 +-
.../Test/Fixture/ConfigurableProduct.php | 4 +-
.../Fixture/ConfigurableProductInjectable.php | 12 ++---
.../ConfigurableAttributesData.php | 6 +--
...ConfigurableProductInjectableInterface.php | 2 +-
.../ConfigurableProductInjectable/Curl.php | 4 +-
.../Test/Handler/Curl/CreateConfigurable.php | 12 ++---
.../ConfigurableProductInjectable.php | 2 +-
.../CreateConfigurableProductEntityTest.php | 2 +-
.../Test/TestCase/CreateConfigurableTest.php | 4 +-
.../Test/TestCase/CreateWithAttributeTest.php | 4 +-
.../Test/TestCase/EditConfigurableTest.php | 2 +-
.../UpdateConfigurableProductEntityTest.php | 2 +-
.../UpdateConfigurableProductStep.php | 4 +-
.../ConfigurableProduct/Test/etc/scenario.xml | 2 +-
.../System/Variable/FormPageActions.php | 2 +-
.../app/Magento/Core/Test/Block/Messages.php | 4 +-
.../Constraint/AssertCustomVariableForm.php | 2 +-
.../Constraint/AssertCustomVariableInGrid.php | 2 +-
.../Constraint/AssertCustomVariableInPage.php | 6 +--
.../AssertCustomVariableNotInCmsPageForm.php | 2 +-
.../AssertCustomVariableNotInGrid.php | 2 +-
...sertCustomVariableSuccessDeleteMessage.php | 2 +-
...AssertCustomVariableSuccessSaveMessage.php | 2 +-
.../Magento/Core/Test/Fixture/ConfigData.php | 2 +-
.../Core/Test/Fixture/SystemVariable.php | 2 +-
.../ConfigData/ConfigDataInterface.php | 2 +-
.../Core/Test/Handler/ConfigData/Curl.php | 12 ++---
.../Core/Test/Handler/SystemVariable/Curl.php | 12 ++---
.../SystemVariableInterface.php | 2 +-
.../Core/Test/Repository/SystemVariable.php | 2 +-
.../Block/Account/AddressesAdditional.php | 4 +-
.../Test/Block/Account/AddressesDefault.php | 4 +-
.../Test/Block/Account/Dashboard/Address.php | 2 +-
.../Test/Block/Account/Dashboard/Info.php | 2 +-
.../Customer/Test/Block/Account/Links.php | 4 +-
.../Customer/Test/Block/Address/Edit.php | 4 +-
.../Block/Adminhtml/Edit/CustomerForm.php | 4 +-
.../Block/Adminhtml/Edit/Tab/Addresses.php | 8 +--
.../Customer/Test/Block/Form/CustomerForm.php | 6 +--
.../Test/Block/Form/ForgotPassword.php | 4 +-
.../Customer/Test/Block/Form/Login.php | 6 +--
.../Customer/Test/Block/Form/Register.php | 6 +--
.../AssertAddressDeletedBackend.php | 2 +-
.../AssertAddressDeletedFrontend.php | 2 +-
.../AssertChangePasswordFailMessage.php | 2 +-
...ssertCustomerAddressSuccessSaveMessage.php | 2 +-
.../AssertCustomerDefaultAddresses.php | 2 +-
.../AssertCustomerFailRegisterMessage.php | 2 +-
.../Test/Constraint/AssertCustomerForm.php | 2 +-
.../AssertCustomerGroupAlreadyExists.php | 2 +-
.../Constraint/AssertCustomerGroupForm.php | 2 +-
.../Constraint/AssertCustomerGroupInGrid.php | 2 +-
.../AssertCustomerGroupNotInGrid.php | 2 +-
.../AssertCustomerGroupOnCustomerForm.php | 4 +-
...ssertCustomerGroupSuccessDeleteMessage.php | 2 +-
.../AssertCustomerGroupSuccessSaveMessage.php | 2 +-
.../Test/Constraint/AssertCustomerInGrid.php | 2 +-
.../AssertCustomerInfoSuccessSavedMessage.php | 2 +-
.../Constraint/AssertCustomerInvalidEmail.php | 2 +-
.../AssertCustomerMassDeleteInGrid.php | 2 +-
.../AssertCustomerMassDeleteNotInGrid.php | 2 +-
...AssertCustomerMassDeleteSuccessMessage.php | 2 +-
.../Constraint/AssertCustomerNotInGrid.php | 2 +-
.../AssertCustomerPasswordChanged.php | 4 +-
.../AssertCustomerRedirectToDashboard.php | 2 +-
.../AssertCustomerSuccessDeleteMessage.php | 2 +-
.../AssertCustomerSuccessRegisterMessage.php | 2 +-
.../AssertCustomerSuccessSaveMessage.php | 2 +-
.../AssertMassActionSuccessUpdateMessage.php | 2 +-
.../AssertWrongPassConfirmationMessage.php | 2 +-
.../Magento/Customer/Test/Fixture/Address.php | 6 +--
.../Customer/Test/Fixture/AddressBook.php | 8 +--
.../Test/Fixture/AddressInjectable.php | 2 +-
.../Customer/Test/Fixture/Customer.php | 4 +-
.../Customer/Test/Fixture/CustomerBackend.php | 2 +-
.../Customer/Test/Fixture/CustomerGroup.php | 4 +-
.../Fixture/CustomerGroup/TaxClassIds.php | 4 +-
.../Test/Fixture/CustomerGroupInjectable.php | 2 +-
.../Test/Fixture/CustomerInjectable.php | 2 +-
.../Fixture/CustomerInjectable/Address.php | 4 +-
.../Fixture/CustomerInjectable/GroupId.php | 4 +-
.../Test/Handler/Curl/CreateCustomer.php | 8 +--
.../Handler/Curl/CreateCustomerBackend.php | 12 ++---
.../Test/Handler/Curl/CreateCustomerGroup.php | 12 ++---
.../Handler/Curl/SaveCustomerWithAddress.php | 8 +--
.../Handler/CustomerGroupInjectable/Curl.php | 12 ++---
.../CustomerGroupInjectableInterface.php | 2 +-
.../Test/Handler/CustomerInjectable/Curl.php | 12 ++---
.../CustomerInjectableInterface.php | 2 +-
.../Test/Handler/Ui/CreateAddress.php | 6 +--
.../Test/Handler/Webapi/CreateCustomer.php | 6 +--
.../Test/Page/Address/DefaultAddress.php | 6 +--
.../Page/CustomerAccountForgotPassword.php | 6 +--
.../Test/Page/CustomerAccountLogout.php | 2 +-
.../Test/Page/CustomerAddressEdit.php | 6 +--
.../Customer/Test/Repository/Address.php | 2 +-
.../Test/Repository/AddressInjectable.php | 2 +-
.../Customer/Test/Repository/Customer.php | 2 +-
.../Test/Repository/CustomerGroup.php | 2 +-
.../Repository/CustomerGroupInjectable.php | 2 +-
.../Test/Repository/CustomerInjectable.php | 2 +-
.../TestCase/BackendCustomerCreateTest.php | 4 +-
.../CreateCustomerBackendEntityTest.php | 2 +-
.../CreateCustomerGroupEntityTest.php | 2 +-
.../CreateExistingCustomerFrontendEntity.php | 2 +-
.../TestCase/DeleteCustomerAddressTest.php | 2 +-
.../DeleteCustomerBackendEntityTest.php | 2 +-
.../DeleteCustomerGroupEntityTest.php | 2 +-
.../TestCase/ForgotPasswordOnFrontendTest.php | 4 +-
.../TestCase/MassAssignCustomerGroupTest.php | 2 +-
.../MassDeleteCustomerBackendEntityTest.php | 4 +-
.../RegisterCustomerFrontendEntityTest.php | 2 +-
.../UpdateCustomerBackendEntityTest.php | 2 +-
.../UpdateCustomerFrontendEntityTest.php | 4 +-
.../UpdateCustomerGroupEntityTest.php | 2 +-
.../Test/TestStep/CreateCustomerStep.php | 2 +-
.../CreateOrderFromCustomerAccountStep.php | 2 +-
.../TestStep/LoginCustomerOnFrontendStep.php | 2 +-
.../TestStep/LogoutCustomerOnFrontendStep.php | 2 +-
.../TestStep/OpenCustomerOnBackendStep.php | 2 +-
.../Magento/Customer/Test/etc/scenario.xml | 2 +-
.../Catalog/Product/Edit/Tab/Downloadable.php | 6 +--
.../Product/Edit/Tab/Downloadable/LinkRow.php | 2 +-
.../Product/Edit/Tab/Downloadable/Links.php | 6 +--
.../Edit/Tab/Downloadable/SampleRow.php | 2 +-
.../Product/Edit/Tab/Downloadable/Samples.php | 6 +--
.../Adminhtml/Product/Composite/Configure.php | 2 +-
.../Test/Block/Catalog/Product/View.php | 4 +-
.../Test/Block/Catalog/Product/View/Links.php | 4 +-
.../Block/Catalog/Product/View/Samples.php | 2 +-
.../Block/Customer/Products/ListProducts.php | 4 +-
.../AssertDownloadableDuplicateForm.php | 2 +-
.../AssertDownloadableLinksData.php | 4 +-
...ProductInCustomerWishlistOnBackendGrid.php | 2 +-
.../AssertDownloadableSamplesData.php | 4 +-
.../Downloadable/Test/Fixture/Cart/Item.php | 2 +-
.../Test/Fixture/DownloadableProduct.php | 2 +-
.../LinksNotPurchasedSeparately.php | 2 +-
.../LinksPurchasedSeparately.php | 2 +-
.../Fixture/DownloadableProductInjectable.php | 2 +-
.../DownloadableProductInjectable/Links.php | 2 +-
.../DownloadableProductInjectable/Samples.php | 2 +-
.../Test/Handler/Curl/CreateDownloadable.php | 12 ++---
.../DownloadableProductInjectable/Curl.php | 10 ++--
...DownloadableProductInjectableInterface.php | 2 +-
.../DownloadableProductInjectable.php | 2 +-
.../Create/LinksPurchasedSeparatelyTest.php | 4 +-
.../CreateDownloadableProductEntityTest.php | 2 +-
.../UpdateDownloadableProductEntityTest.php | 4 +-
.../Downloadable/Test/etc/constraint.xml | 2 +-
.../Block/Adminhtml/Order/Create/Form.php | 6 +--
.../Adminhtml/Order/Create/GiftOptions.php | 2 +-
.../Block/Adminhtml/Order/Create/Items.php | 4 +-
.../Order/Create/Items/ItemProduct.php | 2 +-
.../Test/Block/Adminhtml/Order/View/Form.php | 2 +-
.../Adminhtml/Order/View/GiftOptions.php | 2 +-
.../Test/Block/Adminhtml/Order/View/Items.php | 4 +-
.../Order/View/Items/ItemProduct.php | 2 +-
.../GiftMessage/Test/Block/Message/Inline.php | 4 +-
.../Block/Message/Inline/GiftMessageForm.php | 2 +-
.../Test/Block/Message/Order/Items/View.php | 4 +-
.../AssertGiftMessageInBackendOrder.php | 2 +-
.../AssertGiftMessageInFrontendOrder.php | 2 +-
.../AssertGiftMessageInFrontendOrderItems.php | 2 +-
.../GiftMessage/Test/Fixture/GiftMessage.php | 2 +-
.../Test/Fixture/GiftMessage/Items.php | 4 +-
.../Test/Repository/GiftMessage.php | 2 +-
.../TestStep/AddGiftMessageBackendStep.php | 2 +-
.../Test/TestStep/AddGiftMessageStep.php | 2 +-
.../Magento/GiftMessage/Test/etc/scenario.xml | 2 +-
.../Types/Edit/GoogleShoppingForm.php | 6 +--
...uctAttributeAbsenceForAttributeMapping.php | 4 +-
.../Test/Fixture/GoogleShoppingAttribute.php | 2 +-
.../AttributeSetId.php | 4 +-
.../Repository/GoogleShoppingAttribute.php | 2 +-
.../Adminhtml/Product/Composite/Configure.php | 2 +-
.../Product/Grouped/AssociatedProducts.php | 6 +--
.../ListAssociatedProducts.php | 4 +-
.../ListAssociatedProducts/Product.php | 2 +-
.../Test/Block/Catalog/Product/View.php | 2 +-
.../Catalog/Product/View/Type/Grouped.php | 8 +--
.../Test/Block/Checkout/Cart.php | 2 +-
...bstractAssertPriceOnGroupedProductPage.php | 4 +-
...AssertGroupedPriceOnGroupedProductPage.php | 2 +-
.../Constraint/AssertGroupedProductForm.php | 2 +-
...ProductInCustomerWishlistOnBackendGrid.php | 2 +-
...AssertGroupedProductInItemsOrderedGrid.php | 2 +-
.../AssertGroupedProductsDefaultQty.php | 4 +-
...AssertSpecialPriceOnGroupedProductPage.php | 2 +-
.../AssertTierPriceOnGroupedProductPage.php | 2 +-
.../GroupedProduct/Test/Fixture/Cart/Item.php | 2 +-
.../Test/Fixture/GroupedProduct.php | 4 +-
.../Test/Fixture/GroupedProductInjectable.php | 12 ++---
.../GroupedProductInjectable/Associated.php | 6 +--
.../GroupedProductInjectable/Price.php | 2 +-
.../Handler/GroupedProductInjectable/Curl.php | 2 +-
.../GroupedProductInjectableInterface.php | 2 +-
.../Repository/GroupedProductInjectable.php | 2 +-
.../CreateGroupedProductEntityTest.php | 2 +-
.../Test/TestCase/CreateGroupedTest.php | 4 +-
.../UpdateGroupedProductEntityTest.php | 2 +-
.../Test/Block/Adminhtml/Export/Edit/Form.php | 2 +-
...AssertProductAttributeAbsenceForExport.php | 2 +-
.../Test/Fixture/ImportExport.php | 2 +-
.../Install/Test/Block/CreateAdmin.php | 8 +--
.../Install/Test/Block/CustomizeStore.php | 8 +--
.../Magento/Install/Test/Block/Database.php | 4 +-
.../Magento/Install/Test/Block/Install.php | 4 +-
.../Magento/Install/Test/Block/Landing.php | 4 +-
.../Magento/Install/Test/Block/License.php | 4 +-
.../Magento/Install/Test/Block/Readiness.php | 4 +-
.../Install/Test/Block/WebConfiguration.php | 2 +-
.../Constraint/AssertAgreementTextPresent.php | 2 +-
.../Constraint/AssertCurrencySelected.php | 2 +-
.../Test/Constraint/AssertKeyCreated.php | 2 +-
.../Constraint/AssertLanguageSelected.php | 2 +-
.../Test/Constraint/AssertRewritesEnabled.php | 4 +-
.../Constraint/AssertSecureUrlEnabled.php | 4 +-
.../Test/Constraint/AssertSuccessInstall.php | 2 +-
.../AssertSuccessfulReadinessCheck.php | 2 +-
.../Magento/Install/Test/Fixture/Install.php | 2 +-
.../Install/Test/TestCase/InstallTest.php | 6 +--
.../Adminhtml/Integration/IntegrationGrid.php | 2 +-
.../IntegrationGrid/DeleteDialog.php | 4 +-
.../IntegrationGrid/ResourcesPopup.php | 2 +-
.../IntegrationGrid/TokensPopup.php | 2 +-
.../Test/Constraint/AssertIntegrationForm.php | 2 +-
.../Constraint/AssertIntegrationInGrid.php | 2 +-
.../Constraint/AssertIntegrationNotInGrid.php | 2 +-
.../AssertIntegrationResourcesPopup.php | 2 +-
...ertIntegrationSuccessActivationMessage.php | 2 +-
.../AssertIntegrationSuccessDeleteMessage.php | 2 +-
...rtIntegrationSuccessReauthorizeMessage.php | 2 +-
.../AssertIntegrationSuccessSaveMessage.php | 2 +-
...ssertIntegrationTokensAfterReauthorize.php | 2 +-
.../AssertIntegrationTokensPopup.php | 2 +-
.../Integration/Test/Fixture/Integration.php | 2 +-
.../Test/Handler/Integration/Curl.php | 12 ++---
.../Integration/IntegrationInterface.php | 2 +-
.../Test/Repository/Integration.php | 2 +-
.../ActivateIntegrationEntityTest.php | 2 +-
.../TestCase/CreateIntegrationEntityTest.php | 2 +-
.../TestCase/DeleteIntegrationEntityTest.php | 2 +-
...ReAuthorizeTokensIntegrationEntityTest.php | 4 +-
.../TestCase/UpdateIntegrationEntityTest.php | 2 +-
.../Test/Block/Adminhtml/Template/Grid.php | 2 +-
.../Test/Block/Adminhtml/Template/Preview.php | 4 +-
...AssertCustomerIsSubscribedToNewsletter.php | 2 +-
.../Test/Constraint/AssertNewsletterForm.php | 2 +-
.../Constraint/AssertNewsletterInGrid.php | 2 +-
.../Constraint/AssertNewsletterPreview.php | 4 +-
.../Test/Constraint/AssertNewsletterQueue.php | 2 +-
.../AssertNewsletterSuccessCreateMessage.php | 2 +-
.../Newsletter/Test/Fixture/Template.php | 2 +-
.../Newsletter/Test/Handler/Template/Curl.php | 12 ++---
.../Handler/Template/TemplateInterface.php | 2 +-
.../Newsletter/Test/Repository/Template.php | 2 +-
.../ActionNewsletterTemplateEntityTest.php | 2 +-
.../CreateNewsletterTemplateEntityTest.php | 2 +-
.../TestCase/UpdateNewsletterTemplateTest.php | 2 +-
.../Test/Block/Adminhtml/AbstractFilter.php | 4 +-
.../Block/Adminhtml/Customer/AccountsGrid.php | 4 +-
.../Block/Adminhtml/Customer/Totals/Grid.php | 4 +-
.../Adminhtml/Refresh/Statistics/Grid.php | 2 +-
.../Block/Adminhtml/Review/Customer/Grid.php | 2 +-
.../Block/Adminhtml/Review/Products/Grid.php | 2 +-
.../Review/Products/Viewed/ProductGrid.php | 2 +-
.../Sales/Orders/Viewed/FilterGrid.php | 2 +-
.../Block/Adminhtml/Shopcart/Product/Grid.php | 2 +-
...bstractAssertCustomerOrderReportResult.php | 2 +-
.../AbstractAssertInvoiceReportResult.php | 4 +-
.../AbstractAssertSalesReportResult.php | 4 +-
.../AssertAbandonedCartCustomerInfoResult.php | 2 +-
.../AssertBestsellerReportResult.php | 2 +-
.../Constraint/AssertCouponReportResult.php | 2 +-
.../AssertDownloadsReportResult.php | 2 +-
.../AssertLowStockProductInGrid.php | 2 +-
.../AssertNewAccountsReportTotalResult.php | 2 +-
.../Constraint/AssertOrderedProductResult.php | 2 +-
.../Constraint/AssertProductInCartResult.php | 2 +-
.../AssertProductReportByCustomerInGrid.php | 2 +-
...AssertProductReportByCustomerNotInGrid.php | 2 +-
...sertProductReviewIsAvailableForProduct.php | 2 +-
...sertProductReviewReportIsVisibleInGrid.php | 2 +-
.../AssertProductReviewsQtyByCustomer.php | 2 +-
.../AssertProductViewsReportTotalResult.php | 2 +-
.../Constraint/AssertSearchTermReportForm.php | 2 +-
.../Constraint/AssertSearchTermsInGrid.php | 2 +-
.../Test/Constraint/AssertTaxReportInGrid.php | 2 +-
.../Constraint/AssertTaxReportNotInGrid.php | 2 +-
.../AbandonedCartsReportEntityTest.php | 6 +--
.../CustomerReviewReportEntityTest.php | 6 +--
.../LowStockProductsReportEntityTest.php | 2 +-
.../TestCase/NewAccountsReportEntityTest.php | 2 +-
.../ProductReviewReportEntityTest.php | 2 +-
.../TestCase/ProductsInCartReportEntity.php | 4 +-
.../TestCase/SearchTermsReportEntityTest.php | 4 +-
.../ViewedProductsReportEntityTest.php | 6 +--
.../Block/Adminhtml/Edit/RatingElement.php | 4 +-
.../Test/Block/Adminhtml/ReviewForm.php | 2 +-
.../app/Magento/Review/Test/Block/Form.php | 8 +--
.../Review/Test/Block/Product/View.php | 2 +-
.../Test/Block/Product/View/Summary.php | 4 +-
.../Constraint/AssertProductRatingInGrid.php | 2 +-
.../AssertProductRatingInProductPage.php | 4 +-
.../AssertProductRatingNotInGrid.php | 2 +-
.../AssertProductRatingNotInProductPage.php | 4 +-
.../AssertProductRatingOnReviewPage.php | 2 +-
...ssertProductRatingSuccessDeleteMessage.php | 2 +-
.../AssertProductRatingSuccessSaveMessage.php | 2 +-
...ProductReviewBackendSuccessSaveMessage.php | 2 +-
.../Constraint/AssertProductReviewForm.php | 2 +-
.../Constraint/AssertProductReviewInGrid.php | 4 +-
...ssertProductReviewInGridOnCustomerPage.php | 2 +-
...sertProductReviewIsAbsentOnProductPage.php | 2 +-
...ctReviewMassActionSuccessDeleteMessage.php | 2 +-
...tProductReviewMassActionSuccessMessage.php | 2 +-
.../AssertProductReviewNotInGrid.php | 4 +-
.../AssertProductReviewNotOnProductPage.php | 4 +-
.../AssertProductReviewOnProductPage.php | 6 +--
.../AssertReviewCreationSuccessMessage.php | 2 +-
...ssertReviewLinksIsPresentOnProductPage.php | 6 +--
.../AssertReviewSuccessSaveMessage.php | 2 +-
.../AssertSetApprovedProductReview.php | 2 +-
.../Magento/Review/Test/Fixture/Rating.php | 2 +-
.../Magento/Review/Test/Fixture/Review.php | 2 +-
.../Review/Test/Fixture/Review/EntityId.php | 6 +--
.../Review/Test/Fixture/Review/Ratings.php | 4 +-
.../Review/Test/Handler/Rating/Curl.php | 12 ++---
.../Test/Handler/Rating/RatingInterface.php | 2 +-
.../Review/Test/Handler/Review/Curl.php | 12 ++---
.../Test/Handler/Review/ReviewInterface.php | 2 +-
.../Magento/Review/Test/Repository/Rating.php | 2 +-
.../Magento/Review/Test/Repository/Review.php | 2 +-
.../CreateProductRatingEntityTest.php | 4 +-
.../CreateProductReviewBackendEntityTest.php | 2 +-
.../CreateProductReviewFrontendEntityTest.php | 4 +-
.../DeleteProductRatingEntityTest.php | 4 +-
...anageProductReviewFromCustomerPageTest.php | 4 +-
.../MassActionsProductReviewEntityTest.php | 2 +-
.../ModerateProductReviewEntityTest.php | 2 +-
...teProductReviewEntityOnProductPageTest.php | 4 +-
.../UpdateProductReviewEntityTest.php | 2 +-
.../Block/Adminhtml/Order/AbstractForm.php | 2 +-
.../Adminhtml/Order/AbstractForm/Product.php | 2 +-
.../Block/Adminhtml/Order/AbstractItems.php | 2 +-
.../Adminhtml/Order/AbstractItemsNewBlock.php | 4 +-
.../Test/Block/Adminhtml/Order/Actions.php | 4 +-
.../Test/Block/Adminhtml/Order/Create.php | 8 +--
.../Order/Create/Billing/Address.php | 2 +-
.../Adminhtml/Order/Create/Billing/Method.php | 2 +-
.../Block/Adminhtml/Order/Create/Customer.php | 2 +-
.../Order/Create/CustomerActivities.php | 4 +-
.../Create/CustomerActivities/Sidebar.php | 4 +-
.../Sidebar/RecentlyViewedProducts.php | 2 +-
.../Block/Adminhtml/Order/Create/Items.php | 4 +-
.../Order/Create/Items/ItemProduct.php | 4 +-
.../Order/Create/Shipping/Address.php | 4 +-
.../Order/Create/Shipping/Method.php | 4 +-
.../Block/Adminhtml/Order/Create/Store.php | 6 +--
.../Block/Adminhtml/Order/Create/Totals.php | 2 +-
.../Sales/Test/Block/Adminhtml/Order/Grid.php | 2 +-
.../Test/Block/Adminhtml/Order/History.php | 4 +-
.../Adminhtml/Order/Invoice/Form/Items.php | 4 +-
.../Block/Adminhtml/Order/Invoice/Grid.php | 2 +-
.../Block/Adminhtml/Order/Invoice/Totals.php | 4 +-
.../Block/Adminhtml/Order/Shipment/Totals.php | 2 +-
.../Order/Status/Assign/AssignForm.php | 2 +-
.../Test/Block/Adminhtml/Order/Totals.php | 4 +-
.../Test/Block/Adminhtml/Order/View/Info.php | 4 +-
.../Test/Block/Adminhtml/Order/View/Items.php | 4 +-
.../Block/Adminhtml/Order/View/Tab/Info.php | 4 +-
.../Sales/Test/Block/Order/History.php | 6 +--
.../Magento/Sales/Test/Block/Order/Info.php | 4 +-
.../Magento/Sales/Test/Block/Order/Items.php | 6 +--
.../Magento/Sales/Test/Block/Order/View.php | 4 +-
.../Test/Block/Order/View/ActionsToolbar.php | 4 +-
.../Test/Constraint/AbstractAssertItems.php | 2 +-
.../AbstractAssertOrderOnFrontend.php | 4 +-
.../Constraint/AssertCreditMemoButton.php | 2 +-
.../AssertInvoiceInInvoicesGrid.php | 2 +-
.../Constraint/AssertInvoiceInInvoicesTab.php | 2 +-
.../AssertInvoiceSuccessCreateMessage.php | 2 +-
...ssertInvoiceWithShipmentSuccessMessage.php | 2 +-
.../Constraint/AssertNoCreditMemoButton.php | 2 +-
.../Test/Constraint/AssertNoInvoiceButton.php | 2 +-
.../AssertOrderButtonsAvailable.php | 2 +-
.../AssertOrderButtonsUnavailable.php | 2 +-
...AssertOrderCancelMassActionFailMessage.php | 2 +-
...ertOrderCancelMassActionSuccessMessage.php | 2 +-
.../AssertOrderCancelSuccessMessage.php | 2 +-
.../Test/Constraint/AssertOrderGrandTotal.php | 2 +-
.../Constraint/AssertOrderInOrdersGrid.php | 2 +-
.../AssertOrderInOrdersGridOnFrontend.php | 4 +-
.../AssertOrderMassOnHoldSuccessMessage.php | 2 +-
.../Constraint/AssertOrderNotInOrdersGrid.php | 2 +-
.../AssertOrderNotVisibleOnMyAccount.php | 4 +-
.../AssertOrderOnHoldFailMessage.php | 2 +-
.../AssertOrderOnHoldSuccessMessage.php | 2 +-
.../AssertOrderReleaseFailMessage.php | 2 +-
.../AssertOrderReleaseSuccessMessage.php | 2 +-
.../AssertOrderStatusDuplicateStatus.php | 2 +-
.../Constraint/AssertOrderStatusInGrid.php | 2 +-
.../Constraint/AssertOrderStatusIsCorrect.php | 2 +-
.../AssertOrderStatusNotAssigned.php | 2 +-
.../AssertOrderStatusSuccessAssignMessage.php | 2 +-
.../AssertOrderStatusSuccessCreateMessage.php | 2 +-
...ssertOrderStatusSuccessUnassignMessage.php | 2 +-
.../AssertOrderSuccessCreateMessage.php | 2 +-
.../Constraint/AssertOrdersInOrdersGrid.php | 2 +-
.../AssertProductInItemsOrderedGrid.php | 4 +-
.../AssertRefundInCreditMemoTab.php | 2 +-
.../Constraint/AssertRefundInRefundsGrid.php | 2 +-
.../AssertRefundSuccessCreateMessage.php | 2 +-
.../AssertReorderStatusIsCorrect.php | 2 +-
.../AssertSalesPrintOrderBillingAddress.php | 2 +-
.../AssertSalesPrintOrderGrandTotal.php | 2 +-
.../AssertSalesPrintOrderPaymentMethod.php | 2 +-
.../AssertSalesPrintOrderProducts.php | 4 +-
.../Test/Constraint/AssertUnholdButton.php | 2 +-
.../Sales/Test/Page/SalesOrderShipmentNew.php | 6 +--
.../Sales/Test/TestStep/AddProductsStep.php | 2 +-
.../AddRecentlyViewedProductsToCartStep.php | 2 +-
.../Test/TestStep/ConfigureProductsStep.php | 2 +-
.../Test/TestStep/CreateNewOrderStep.php | 2 +-
.../Test/TestStep/FillBillingAddressStep.php | 2 +-
.../Test/TestStep/OpenSalesOrdersStep.php | 2 +-
.../TestStep/PrintOrderOnFrontendStep.php | 4 +-
.../Sales/Test/TestStep/ReorderStep.php | 2 +-
.../Test/TestStep/SelectCustomerOrderStep.php | 2 +-
.../SelectPaymentMethodForOrderStep.php | 2 +-
.../SelectShippingMethodForOrderStep.php | 2 +-
.../Sales/Test/TestStep/SelectStoreStep.php | 2 +-
.../Sales/Test/TestStep/SubmitOrderStep.php | 6 +--
.../Test/TestStep/UpdateProductsDataStep.php | 2 +-
.../app/Magento/Sales/Test/etc/scenario.xml | 2 +-
.../Test/Block/Adminhtml/Order/Tracking.php | 4 +-
.../Block/Adminhtml/Order/Tracking/Item.php | 2 +-
.../Shipping/Test/Block/Order/Info.php | 2 +-
.../Shipping/Test/Block/Order/Shipment.php | 4 +-
.../Test/Block/Order/Shipment/Items.php | 2 +-
.../Test/Constraint/AssertNoShipButton.php | 2 +-
.../AssertShipmentInShipmentsGrid.php | 2 +-
.../AssertShipmentInShipmentsTab.php | 2 +-
.../Test/Constraint/AssertShipmentItems.php | 2 +-
.../AssertShipmentSuccessCreateMessage.php | 2 +-
.../AssertShippingMethodOnPrintOrder.php | 2 +-
.../Magento/Shipping/Test/Fixture/Method.php | 4 +-
.../Shipping/Test/Repository/Method.php | 2 +-
.../Test/Block/Adminhtml/SitemapGrid.php | 2 +-
.../Test/Constraint/AssertSitemapContent.php | 2 +-
.../AssertSitemapFailFolderSaveMessage.php | 2 +-
.../AssertSitemapFailPathSaveMessage.php | 2 +-
.../Test/Constraint/AssertSitemapInGrid.php | 2 +-
.../Constraint/AssertSitemapNotInGrid.php | 2 +-
.../AssertSitemapSuccessDeleteMessage.php | 2 +-
.../AssertSitemapSuccessGenerateMessage.php | 2 +-
...tSitemapSuccessSaveAndGenerateMessages.php | 2 +-
.../AssertSitemapSuccessSaveMessage.php | 2 +-
.../Magento/Sitemap/Test/Fixture/Sitemap.php | 2 +-
.../Sitemap/Test/Handler/Sitemap/Curl.php | 12 ++---
.../Test/Handler/Sitemap/SitemapInterface.php | 2 +-
.../Sitemap/Test/Repository/Sitemap.php | 2 +-
.../Test/TestCase/CreateSitemapEntityTest.php | 2 +-
.../Test/TestCase/DeleteSitemapEntityTest.php | 2 +-
.../app/Magento/Store/Test/Block/Switcher.php | 4 +-
.../Test/Constraint/AssertStoreBackend.php | 2 +-
.../Store/Test/Constraint/AssertStoreForm.php | 2 +-
.../Test/Constraint/AssertStoreFrontend.php | 2 +-
.../Test/Constraint/AssertStoreGroupForm.php | 2 +-
.../Constraint/AssertStoreGroupInGrid.php | 2 +-
.../Constraint/AssertStoreGroupNotInGrid.php | 2 +-
.../AssertStoreGroupOnStoreViewForm.php | 2 +-
...oreGroupSuccessDeleteAndBackupMessages.php | 2 +-
.../AssertStoreGroupSuccessDeleteMessage.php | 2 +-
.../AssertStoreGroupSuccessSaveMessage.php | 2 +-
.../Test/Constraint/AssertStoreInGrid.php | 2 +-
.../Test/Constraint/AssertStoreNotInGrid.php | 2 +-
.../Constraint/AssertStoreNotOnFrontend.php | 2 +-
...ertStoreSuccessDeleteAndBackupMessages.php | 2 +-
.../AssertStoreSuccessDeleteMessage.php | 2 +-
.../AssertStoreSuccessSaveMessage.php | 2 +-
.../Test/Constraint/AssertWebsiteForm.php | 2 +-
.../Test/Constraint/AssertWebsiteInGrid.php | 2 +-
.../Constraint/AssertWebsiteNotInGrid.php | 2 +-
.../Constraint/AssertWebsiteOnStoreForm.php | 2 +-
...tWebsiteSuccessDeleteAndBackupMessages.php | 2 +-
.../AssertWebsiteSuccessDeleteMessage.php | 2 +-
.../AssertWebsiteSuccessSaveMessage.php | 2 +-
.../app/Magento/Store/Test/Fixture/Store.php | 2 +-
.../Store/Test/Fixture/Store/GroupId.php | 4 +-
.../Magento/Store/Test/Fixture/StoreGroup.php | 2 +-
.../Test/Fixture/StoreGroup/CategoryId.php | 4 +-
.../Test/Fixture/StoreGroup/WebsiteId.php | 4 +-
.../Magento/Store/Test/Fixture/Website.php | 2 +-
.../Magento/Store/Test/Handler/Store/Curl.php | 12 ++---
.../Test/Handler/Store/StoreInterface.php | 2 +-
.../Store/Test/Handler/StoreGroup/Curl.php | 12 ++---
.../StoreGroup/StoreGroupInterface.php | 2 +-
.../Store/Test/Handler/Website/Curl.php | 12 ++---
.../Test/Handler/Website/WebsiteInterface.php | 2 +-
.../Magento/Store/Test/Repository/Store.php | 2 +-
.../Store/Test/Repository/StoreGroup.php | 2 +-
.../Magento/Store/Test/Repository/Website.php | 2 +-
.../Test/TestCase/CreateStoreEntityTest.php | 2 +-
.../TestCase/CreateStoreGroupEntityTest.php | 2 +-
.../Test/TestCase/CreateWebsiteEntityTest.php | 2 +-
.../Test/TestCase/DeleteStoreEntityTest.php | 2 +-
.../TestCase/DeleteStoreGroupEntityTest.php | 2 +-
.../Test/TestCase/DeleteWebsiteEntityTest.php | 2 +-
.../Magento/Store/Test/TestCase/StoreTest.php | 4 +-
.../Test/TestCase/UpdateStoreEntityTest.php | 2 +-
.../TestCase/UpdateStoreGroupEntityTest.php | 2 +-
.../Test/TestCase/UpdateWebsiteEntityTest.php | 4 +-
.../Test/Block/Adminhtml/Rate/Edit/Form.php | 2 +-
.../Test/Block/Adminhtml/Rule/Edit/Form.php | 10 ++--
.../Block/Adminhtml/Rule/Edit/TaxRate.php | 2 +-
...stractAssertTaxWithCrossBorderApplying.php | 2 +-
.../Tax/Test/Constraint/AssertTaxRateForm.php | 2 +-
.../Test/Constraint/AssertTaxRateInGrid.php | 2 +-
.../Constraint/AssertTaxRateInTaxRule.php | 2 +-
.../AssertTaxRateIsInCorrectRange.php | 2 +-
.../Constraint/AssertTaxRateNotInGrid.php | 2 +-
.../Constraint/AssertTaxRateNotInTaxRule.php | 2 +-
.../AssertTaxRateSuccessDeleteMessage.php | 2 +-
.../AssertTaxRateSuccessSaveMessage.php | 2 +-
.../Test/Constraint/AssertTaxRuleApplying.php | 6 +--
.../Tax/Test/Constraint/AssertTaxRuleForm.php | 2 +-
.../Test/Constraint/AssertTaxRuleInGrid.php | 2 +-
.../AssertTaxRuleIsAppliedToAllPrices.php | 4 +-
.../Constraint/AssertTaxRuleNotInGrid.php | 2 +-
.../AssertTaxRuleSuccessDeleteMessage.php | 2 +-
.../AssertTaxRuleSuccessSaveMessage.php | 2 +-
.../app/Magento/Tax/Test/Fixture/TaxClass.php | 2 +-
.../app/Magento/Tax/Test/Fixture/TaxRate.php | 2 +-
.../app/Magento/Tax/Test/Fixture/TaxRule.php | 2 +-
.../Tax/Test/Fixture/TaxRule/TaxClass.php | 4 +-
.../Tax/Test/Fixture/TaxRule/TaxRate.php | 4 +-
.../Tax/Test/Handler/Curl/RemoveTaxRule.php | 12 ++---
.../Tax/Test/Handler/TaxClass/Curl.php | 12 ++---
.../Handler/TaxClass/TaxClassInterface.php | 2 +-
.../Magento/Tax/Test/Handler/TaxRate/Curl.php | 12 ++---
.../Test/Handler/TaxRate/TaxRateInterface.php | 2 +-
.../Magento/Tax/Test/Handler/TaxRule/Curl.php | 12 ++---
.../Test/Handler/TaxRule/TaxRuleInterface.php | 2 +-
.../Magento/Tax/Test/Repository/TaxClass.php | 2 +-
.../Magento/Tax/Test/Repository/TaxRate.php | 2 +-
.../Magento/Tax/Test/Repository/TaxRule.php | 2 +-
.../Test/TestCase/CreateTaxRateEntityTest.php | 2 +-
.../Test/TestCase/CreateTaxRuleEntityTest.php | 4 +-
.../Test/TestCase/DeleteTaxRateEntityTest.php | 2 +-
.../Test/TestCase/DeleteTaxRuleEntityTest.php | 4 +-
.../Test/TestCase/UpdateTaxRateEntityTest.php | 2 +-
.../Test/TestCase/UpdateTaxRuleEntityTest.php | 6 +--
.../Test/TestStep/DeleteAllTaxRulesStep.php | 2 +-
.../Magento/Theme/Test/Block/Html/Footer.php | 4 +-
.../Magento/Theme/Test/Block/Html/Title.php | 2 +-
.../Magento/Theme/Test/Block/Html/Topmenu.php | 4 +-
.../app/Magento/Theme/Test/Block/Links.php | 4 +-
.../Block/Adminhtml/Catalog/Category/Tree.php | 4 +-
.../Adminhtml/Catalog/Edit/UrlRewriteForm.php | 6 +--
.../Test/Block/Adminhtml/Selector.php | 4 +-
.../AssertPageByUrlRewriteIsNotFound.php | 4 +-
.../AssertUrlRewriteCategoryInGrid.php | 2 +-
.../AssertUrlRewriteCategoryNotInGrid.php | 2 +-
.../AssertUrlRewriteCategoryRedirect.php | 4 +-
.../AssertUrlRewriteCustomRedirect.php | 4 +-
.../AssertUrlRewriteCustomSearchRedirect.php | 4 +-
.../AssertUrlRewriteDeletedMessage.php | 2 +-
.../Constraint/AssertUrlRewriteInGrid.php | 2 +-
.../Constraint/AssertUrlRewriteNotInGrid.php | 2 +-
.../AssertUrlRewriteProductRedirect.php | 6 +--
.../AssertUrlRewriteSaveMessage.php | 2 +-
...AssertUrlRewriteSuccessOutsideRedirect.php | 4 +-
.../AssertUrlRewriteUpdatedProductInGrid.php | 2 +-
.../UrlRewrite/Test/Fixture/UrlRewrite.php | 2 +-
.../Test/Fixture/UrlRewrite/StoreId.php | 4 +-
.../Test/Fixture/UrlRewrite/TargetPath.php | 4 +-
.../Test/Handler/UrlRewrite/Curl.php | 12 ++---
.../UrlRewrite/UrlRewriteInterface.php | 2 +-
.../UrlRewrite/Test/Repository/UrlRewrite.php | 2 +-
.../CreateCategoryRewriteEntityTest.php | 4 +-
.../CreateProductUrlRewriteEntityTest.php | 2 +-
.../DeleteCategoryUrlRewriteEntityTest.php | 2 +-
.../DeleteCustomUrlRewriteEntityTest.php | 2 +-
.../DeleteProductUrlRewriteEntityTest.php | 2 +-
.../UpdateCategoryUrlRewriteEntityTest.php | 4 +-
.../UpdateCustomUrlRewriteEntityTest.php | 2 +-
.../UpdateProductUrlRewriteEntityTest.php | 4 +-
.../UrlRewrite/Test/etc/constraint.xml | 10 ++--
.../Test/Block/Adminhtml/Role/Tab/Role.php | 2 +-
.../Test/Block/Adminhtml/User/Edit/Form.php | 4 +-
.../Block/Adminhtml/User/Edit/Tab/Roles.php | 2 +-
.../Test/Block/Adminhtml/User/Tab/Role.php | 2 +-
.../AssertAccessTokensErrorRevokeMessage.php | 2 +-
.../AssertImpossibleDeleteYourOwnAccount.php | 2 +-
.../AssertImpossibleDeleteYourOwnRole.php | 2 +-
.../User/Test/Constraint/AssertRoleInGrid.php | 2 +-
.../Test/Constraint/AssertRoleNotInGrid.php | 2 +-
.../AssertRoleSuccessDeleteMessage.php | 2 +-
.../AssertRoleSuccessSaveMessage.php | 2 +-
.../Constraint/AssertUserDuplicateMessage.php | 2 +-
.../User/Test/Constraint/AssertUserInGrid.php | 2 +-
.../AssertUserInvalidEmailMessage.php | 2 +-
.../Test/Constraint/AssertUserNotInGrid.php | 2 +-
.../AssertUserRoleSalesRestrictedAccess.php | 2 +-
.../AssertUserSuccessDeleteMessage.php | 2 +-
.../Constraint/AssertUserSuccessLogOut.php | 2 +-
.../Constraint/AssertUserSuccessLogin.php | 2 +-
.../AssertUserSuccessSaveMessage.php | 2 +-
.../AssertUserWrongCredentialsMessage.php | 2 +-
.../Magento/User/Test/Fixture/AdminUser.php | 12 ++---
.../User/Test/Fixture/AdminUserRole.php | 2 +-
.../Fixture/AdminUserRole/InRoleUsers.php | 4 +-
.../Magento/User/Test/Fixture/Resource.php | 2 +-
.../app/Magento/User/Test/Fixture/Role.php | 4 +-
.../app/Magento/User/Test/Fixture/User.php | 12 ++---
.../Magento/User/Test/Fixture/User/RoleId.php | 4 +-
.../AdminUserRole/AdminUserRoleInterface.php | 2 +-
.../User/Test/Handler/AdminUserRole/Curl.php | 12 ++---
.../User/Test/Handler/Curl/CreateRole.php | 12 ++---
.../User/Test/Handler/Curl/CreateUser.php | 12 ++---
.../Magento/User/Test/Handler/User/Curl.php | 12 ++---
.../User/Test/Handler/User/UserInterface.php | 2 +-
.../User/Test/Repository/AdminUser.php | 2 +-
.../User/Test/Repository/AdminUserRole.php | 2 +-
.../app/Magento/User/Test/Repository/Role.php | 4 +-
.../app/Magento/User/Test/Repository/User.php | 8 +--
.../TestCase/CreateAdminUserEntityTest.php | 4 +-
.../CreateAdminUserRoleEntityTest.php | 2 +-
.../TestCase/DeleteAdminUserEntityTest.php | 4 +-
.../TestCase/DeleteUserRoleEntityTest.php | 4 +-
...lAccessTokensForAdminWithoutTokensTest.php | 2 +-
.../TestCase/UpdateAdminUserEntityTest.php | 4 +-
.../UpdateAdminUserRoleEntityTest.php | 2 +-
.../UserLoginAfterChangingPermissionsTest.php | 4 +-
.../Adminhtml/Customer/Edit/Tab/Wishlist.php | 2 +-
.../Customer/Edit/Tab/Wishlist/Grid.php | 4 +-
.../Wishlist/Test/Block/Customer/Sharing.php | 2 +-
.../Wishlist/Test/Block/Customer/Wishlist.php | 2 +-
.../Test/Block/Customer/Wishlist/Items.php | 6 +--
.../Block/Customer/Wishlist/Items/Product.php | 4 +-
...sertAddProductToWishlistSuccessMessage.php | 4 +-
...ertMoveProductToWishlistSuccessMessage.php | 4 +-
.../AssertProductDetailsInWishlist.php | 6 +--
...ProductInCustomerWishlistOnBackendGrid.php | 4 +-
...ductIsPresentInCustomerBackendWishlist.php | 4 +-
.../AssertProductIsPresentInWishlist.php | 4 +-
.../AssertProductsIsAbsentInWishlist.php | 4 +-
.../Test/Constraint/AssertWishlistIsEmpty.php | 2 +-
.../Constraint/AssertWishlistShareMessage.php | 2 +-
.../Test/TestCase/AbstractWishlistTest.php | 6 +--
.../Test/TestCase/ShareWishlistEntityTest.php | 4 +-
.../TestStep/AddProductsToWishlistStep.php | 4 +-
.../Mtf/TestSuite/GithubPublicationTests.php | 2 +-
.../Mtf/TestSuite/InjectableTests.php | 18 +++----
.../TestSuite/InjectableTests/acceptance.xml | 2 +-
.../Mtf/TestSuite/InjectableTests/basic.xml | 2 +-
.../Mtf/TestSuite/InjectableTests/bat_ce.xml | 2 +-
.../TestSuite/InjectableTests/domain_cs.xml | 2 +-
.../TestSuite/InjectableTests/domain_mx.xml | 2 +-
.../TestSuite/InjectableTests/domain_ps.xml | 2 +-
.../InjectableTests/end_to_end_ce.xml | 2 +-
.../InjectableTests/installation.xml | 2 +-
.../Mtf/TestSuite/InjectableTests/mvp.xml | 2 +-
dev/tests/functional/utils/bootstrap.php | 4 +-
dev/tests/functional/utils/generate.php | 14 ++---
.../functional/utils/generate/constraint.php | 4 +-
.../functional/utils/generate/factory.php | 6 +--
.../functional/utils/generate/fixture.php | 4 +-
.../functional/utils/generate/handler.php | 4 +-
dev/tests/functional/utils/generate/page.php | 4 +-
.../functional/utils/generate/repository.php | 4 +-
1143 files changed, 2083 insertions(+), 2082 deletions(-)
rename dev/tests/functional/lib/{ => Magento}/Mtf/App/State/AbstractState.php (93%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/App/State/State1.php (93%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/ConditionsElement.php (98%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/DatepickerElement.php (97%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/GlobalsearchElement.php (97%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/JquerytreeElement.php (98%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/LiselectstoreElement.php (98%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/MultiselectgrouplistElement.php (98%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/MultiselectlistElement.php (90%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/MultisuggestElement.php (94%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/OptgroupselectElement.php (94%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/SelectstoreElement.php (96%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/SuggestElement.php (97%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/Tree.php (98%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Client/Element/TreeElement.php (95%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Constraint/AbstractAssertForm.php (99%)
mode change 100755 => 100644
rename dev/tests/functional/lib/{ => Magento}/Mtf/EntryPoint/EntryPoint.php (91%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/ObjectManagerFactory.php (61%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Page/BackendPage.php (91%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory.php (97%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/AbstractFactory.php (94%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Block.php (97%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Fixture.php (97%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Handler.php (98%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Page.php (97%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Factory/Repository.php (97%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Fixture/FieldsProvider.php (98%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Repository/CollectionProvider.php (95%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Repository/Resource.php (95%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Generate/Repository/TableCollection.php (89%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/CurlInterface.php (96%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/CurlTransport.php (99%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php (95%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php (96%)
rename dev/tests/functional/lib/{ => Magento}/Mtf/Util/Protocol/SoapTransport.php (97%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/GithubPublicationTests.php (98%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests.php (82%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/acceptance.xml (82%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/basic.xml (75%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/bat_ce.xml (91%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/domain_cs.xml (73%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/domain_mx.xml (73%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/domain_ps.xml (73%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml (95%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/installation.xml (73%)
rename dev/tests/functional/testsuites/{ => Magento}/Mtf/TestSuite/InjectableTests/mvp.xml (73%)
diff --git a/dev/tests/functional/.gitignore b/dev/tests/functional/.gitignore
index d3b32c5f1d4..a415b0cffbf 100755
--- a/dev/tests/functional/.gitignore
+++ b/dev/tests/functional/.gitignore
@@ -8,4 +8,4 @@
!/config/isolation.yml.dist
!/config/server.yml.dist
phpunit.xml
-/lib/Mtf/Util/Generate/testcase.xml
+/lib/Magento/Mtf/Util/Generate/testcase.xml
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 88ba1077889..4a3418c0ff5 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -11,8 +11,7 @@
},
"autoload": {
"psr-4": {
- "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
- "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+ "Magento\\": ["lib/Magento/", "testsuites/Magento", "generated/Magento/", "tests/app/Magento/"],
"Test\\": "generated/Test/"
}
}
diff --git a/dev/tests/functional/composer.json.dist b/dev/tests/functional/composer.json.dist
index 2ea37c5b4a7..81d984634e9 100644
--- a/dev/tests/functional/composer.json.dist
+++ b/dev/tests/functional/composer.json.dist
@@ -6,10 +6,12 @@
"phpunit/phpunit-selenium": ">=1.2",
"netwing/selenium-server-standalone": ">=2.35"
},
+ "suggest": {
+ "facebook/webdriver": "dev-master"
+ },
"autoload": {
"psr-4": {
- "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
- "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+ "Magento\\": ["lib/Magento/", "testsuites/Magento", "generated/Magento/", "tests/app/Magento/"],
"Test\\": "generated/Test/"
}
}
diff --git a/dev/tests/functional/etc/global/di.xml b/dev/tests/functional/etc/global/di.xml
index e4cd6218292..034b05ab359 100644
--- a/dev/tests/functional/etc/global/di.xml
+++ b/dev/tests/functional/etc/global/di.xml
@@ -6,6 +6,6 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
- <preference for="Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Mtf\Util\Generate\Fixture\FieldsProvider" />
- <preference for="Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Mtf\Util\Generate\Repository\CollectionProvider" />
+ <preference for="Magento\Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Magento\Mtf\Util\Generate\Fixture\FieldsProvider" />
+ <preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
</config>
diff --git a/dev/tests/functional/lib/Mtf/App/State/AbstractState.php b/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
similarity index 93%
rename from dev/tests/functional/lib/Mtf/App/State/AbstractState.php
rename to dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
index f1c47546ed0..ad7353b2b53 100644
--- a/dev/tests/functional/lib/Mtf/App/State/AbstractState.php
+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\App\State;
+namespace Magento\Mtf\App\State;
use Magento\Framework\App\DeploymentConfig\DbConfig;
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -39,7 +39,7 @@ abstract class AbstractState implements StateInterface
*/
public function clearInstance()
{
- $dirList = \Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Framework\Filesystem\DirectoryList');
+ $dirList = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Framework\Filesystem\DirectoryList');
$deploymentConfig = new \Magento\Framework\App\DeploymentConfig(
new \Magento\Framework\App\DeploymentConfig\Reader($dirList),
[]
diff --git a/dev/tests/functional/lib/Mtf/App/State/State1.php b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
similarity index 93%
rename from dev/tests/functional/lib/Mtf/App/State/State1.php
rename to dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
index 59d8ecced3b..a5422ee0884 100644
--- a/dev/tests/functional/lib/Mtf/App/State/State1.php
+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
@@ -4,10 +4,10 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\App\State;
+namespace Magento\Mtf\App\State;
-use Mtf\ObjectManager;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Fixture\FixtureFactory;
use Magento\Core\Test\Fixture\ConfigData;
/**
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
index 96cf6112ad3..ea8d59e184e 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
@@ -4,11 +4,11 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\ObjectManager;
-use Mtf\Client\Locator;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\ElementInterface;
/**
* Class ConditionsElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
index 6b6247ee8de..06e56905715 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* General class for datepicker elements.
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/GlobalsearchElement.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/GlobalsearchElement.php
index 1c8e0acc4c7..9d074a65d2c 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/GlobalsearchElement.php
@@ -4,10 +4,10 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\ElementInterface;
/**
* Typified element class for global search element.
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/JquerytreeElement.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/JquerytreeElement.php
index c7d36387b3c..e08b8a6adff 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/JquerytreeElement.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\ElementInterface;
/**
* Class JquerytreeElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php
index 0308a312ea1..858fe692fa2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/LiselectstoreElement.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class LiselectstoreElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectgrouplistElement.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectgrouplistElement.php
index f2fe3958147..88f9924f7eb 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectgrouplistElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectgrouplistElement.php
@@ -4,10 +4,10 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\ElementInterface;
/**
* Class MultiselectgrouplistElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectlistElement.php
similarity index 90%
rename from dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectlistElement.php
index c7c01a8de68..d5d4539e1b4 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultiselectlistElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultiselectlistElement.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Typified element class for Multiple Select List elements
@@ -39,7 +39,7 @@ class MultiselectlistElement extends MultiselectElement
$values = is_array($values) ? $values : [$values];
foreach ($options as $option) {
- /** @var \Mtf\Client\ElementInterface $option */
+ /** @var \Magento\Mtf\Client\ElementInterface $option */
$optionText = $option->getText();
$isChecked = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH)->isVisible();
$inArray = in_array($optionText, $values);
@@ -60,7 +60,7 @@ class MultiselectlistElement extends MultiselectElement
$options = $this->getOptions();
foreach ($options as $option) {
- /** @var \Mtf\Client\ElementInterface $option */
+ /** @var \Magento\Mtf\Client\ElementInterface $option */
$checkedOption = $option->find($this->optionCheckedElement, Locator::SELECTOR_XPATH);
if ($checkedOption->isVisible()) {
$checkedOptions[] = $checkedOption->getText();
@@ -101,7 +101,7 @@ class MultiselectlistElement extends MultiselectElement
$options = $this->getOptions();
foreach ($options as $option) {
- /** @var \Mtf\Client\ElementInterface $option */
+ /** @var \Magento\Mtf\Client\ElementInterface $option */
$optionsValue[] = $option->getText();
}
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultisuggestElement.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/MultisuggestElement.php
index daffc52b3ae..a2644d92930 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/MultisuggestElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/MultisuggestElement.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Typified element class for multi suggest element.
@@ -73,7 +73,7 @@ class MultisuggestElement extends SuggestElement
$values = [];
foreach ($choices as $choice) {
- /** @var \Mtf\Client\ElementInterface $choice */
+ /** @var \Magento\Mtf\Client\ElementInterface $choice */
$values[] = $choice->getText();
}
return $values;
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/OptgroupselectElement.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/OptgroupselectElement.php
index ecb06a901ca..a8398f49316 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/OptgroupselectElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/OptgroupselectElement.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class OptgroupselectElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstoreElement.php
similarity index 96%
rename from dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstoreElement.php
index f2e914969f2..32d1b11119a 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/SelectstoreElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstoreElement.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Typified element class for option group selectors.
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php
index fc1d685204e..a44151e5a98 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/SuggestElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class SuggestElement
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/Tree.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Client/Element/Tree.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/Tree.php
index 499a7d645fd..00c3d41ffe2 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/Tree.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\ElementInterface;
/**
* Class Tree
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/TreeElement.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
rename to dev/tests/functional/lib/Magento/Mtf/Client/Element/TreeElement.php
index 0d715f55a01..09995686b04 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/TreeElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/TreeElement.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Client\Element;
+namespace Magento\Mtf\Client\Element;
/**
* Class TreeElement
diff --git a/dev/tests/functional/lib/Mtf/Constraint/AbstractAssertForm.php b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
old mode 100755
new mode 100644
similarity index 99%
rename from dev/tests/functional/lib/Mtf/Constraint/AbstractAssertForm.php
rename to dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
index e6b0d60d131..a26ff55f584
--- a/dev/tests/functional/lib/Mtf/Constraint/AbstractAssertForm.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Constraint/AbstractAssertForm.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Constraint;
+namespace Magento\Mtf\Constraint;
/**
* Class AssertForm
diff --git a/dev/tests/functional/lib/Mtf/EntryPoint/EntryPoint.php b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
similarity index 91%
rename from dev/tests/functional/lib/Mtf/EntryPoint/EntryPoint.php
rename to dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
index f991ae7b6b1..701897c4562 100644
--- a/dev/tests/functional/lib/Mtf/EntryPoint/EntryPoint.php
+++ b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
@@ -4,9 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\EntryPoint;
+namespace Magento\Mtf\EntryPoint;
-use Mtf\ObjectManager;
+use Magento\Mtf\ObjectManager;
/**
* Class EntryPoint
@@ -60,7 +60,7 @@ class EntryPoint
{
try {
if (!$this->_locator) {
- $locatorFactory = new \Mtf\ObjectManagerFactory();
+ $locatorFactory = new \Magento\Mtf\ObjectManagerFactory();
$this->_locator = $locatorFactory->create();
}
return $this->_locator->create($applicationName, $arguments)->launch();
diff --git a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php
similarity index 61%
rename from dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
rename to dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php
index 5c5a96fc093..9811a2e9f84 100644
--- a/dev/tests/functional/lib/Mtf/ObjectManagerFactory.php
+++ b/dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php
@@ -4,11 +4,11 @@
* See COPYING.txt for license details.
*/
-namespace Mtf;
+namespace Magento\Mtf;
-use Mtf\ObjectManagerInterface as MagentoObjectManager;
-use Mtf\Stdlib\BooleanUtils;
-use Mtf\ObjectManager\Factory;
+use Magento\Mtf\ObjectManagerInterface as MagentoObjectManager;
+use Magento\Mtf\Stdlib\BooleanUtils;
+use Magento\Mtf\ObjectManager\Factory;
/**
* Class ObjectManagerFactory
@@ -23,14 +23,14 @@ class ObjectManagerFactory
*
* @var string
*/
- protected $locatorClassName = '\Mtf\ObjectManager';
+ protected $locatorClassName = '\Magento\Mtf\ObjectManager';
/**
* DI Config class name
*
* @var string
*/
- protected $configClassName = '\Mtf\ObjectManager\Config';
+ protected $configClassName = '\Magento\Mtf\ObjectManager\Config';
/**
* Create Object Manager
@@ -44,15 +44,15 @@ class ObjectManagerFactory
define('MTF_TESTS_PATH', MTF_BP . '/tests/app/');
}
if (!defined('MTF_STATES_PATH')) {
- define('MTF_STATES_PATH', MTF_BP . '/lib/Mtf/App/State/');
+ define('MTF_STATES_PATH', MTF_BP . '/lib/Magento/Mtf/App/State/');
}
$diConfig = new $this->configClassName();
$factory = new Factory($diConfig);
$argInterpreter = $this->createArgumentInterpreter(new BooleanUtils());
- $argumentMapper = new \Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);
+ $argumentMapper = new \Magento\Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);
- $sharedInstances['Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
+ $sharedInstances['Magento\Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
$objectManager = new $this->locatorClassName($factory, $diConfig, $sharedInstances);
$factory->setObjectManager($objectManager);
@@ -86,27 +86,27 @@ class ObjectManagerFactory
/**
* Return newly created instance on an argument interpreter, suitable for processing DI arguments
*
- * @param \Mtf\Stdlib\BooleanUtils $booleanUtils
- * @return \Mtf\Data\Argument\InterpreterInterface
+ * @param \Magento\Mtf\Stdlib\BooleanUtils $booleanUtils
+ * @return \Magento\Mtf\Data\Argument\InterpreterInterface
*/
protected function createArgumentInterpreter(
- \Mtf\Stdlib\BooleanUtils $booleanUtils
+ \Magento\Mtf\Stdlib\BooleanUtils $booleanUtils
) {
- $constInterpreter = new \Mtf\Data\Argument\Interpreter\Constant();
- $result = new \Mtf\Data\Argument\Interpreter\Composite(
+ $constInterpreter = new \Magento\Mtf\Data\Argument\Interpreter\Constant();
+ $result = new \Magento\Mtf\Data\Argument\Interpreter\Composite(
[
- 'boolean' => new \Mtf\Data\Argument\Interpreter\Boolean($booleanUtils),
- 'string' => new \Mtf\Data\Argument\Interpreter\String($booleanUtils),
- 'number' => new \Mtf\Data\Argument\Interpreter\Number(),
- 'null' => new \Mtf\Data\Argument\Interpreter\NullType(),
+ 'boolean' => new \Magento\Mtf\Data\Argument\Interpreter\Boolean($booleanUtils),
+ 'string' => new \Magento\Mtf\Data\Argument\Interpreter\String($booleanUtils),
+ 'number' => new \Magento\Mtf\Data\Argument\Interpreter\Number(),
+ 'null' => new \Magento\Mtf\Data\Argument\Interpreter\NullType(),
'const' => $constInterpreter,
- 'object' => new \Mtf\Data\Argument\Interpreter\Object($booleanUtils),
- 'init_parameter' => new \Mtf\Data\Argument\Interpreter\Argument($constInterpreter),
+ 'object' => new \Magento\Mtf\Data\Argument\Interpreter\Object($booleanUtils),
+ 'init_parameter' => new \Magento\Mtf\Data\Argument\Interpreter\Argument($constInterpreter),
],
- \Mtf\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
+ \Magento\Mtf\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
);
// Add interpreters that reference the composite
- $result->addInterpreter('array', new \Mtf\Data\Argument\Interpreter\ArrayType($result));
+ $result->addInterpreter('array', new \Magento\Mtf\Data\Argument\Interpreter\ArrayType($result));
return $result;
}
@@ -134,19 +134,19 @@ class ObjectManagerFactory
public static function configure(MagentoObjectManager $objectManager)
{
$objectManager->configure(
- $objectManager->get('Mtf\ObjectManager\ConfigLoader\Primary')->load()
+ $objectManager->get('Magento\Mtf\ObjectManager\ConfigLoader\Primary')->load()
);
$objectManager->configure(
- $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load()
+ $objectManager->get('Magento\Mtf\ObjectManager\ConfigLoader\Module')->load()
);
$objectManager->configure(
- $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load('etc/ui')
+ $objectManager->get('Magento\Mtf\ObjectManager\ConfigLoader\Module')->load('etc/ui')
);
$objectManager->configure(
- $objectManager->get('Mtf\ObjectManager\ConfigLoader\Module')->load('etc/curl')
+ $objectManager->get('Magento\Mtf\ObjectManager\ConfigLoader\Module')->load('etc/curl')
);
}
}
diff --git a/dev/tests/functional/lib/Mtf/Page/BackendPage.php b/dev/tests/functional/lib/Magento/Mtf/Page/BackendPage.php
similarity index 91%
rename from dev/tests/functional/lib/Mtf/Page/BackendPage.php
rename to dev/tests/functional/lib/Magento/Mtf/Page/BackendPage.php
index 47999dd6852..e5b6c09f905 100644
--- a/dev/tests/functional/lib/Mtf/Page/BackendPage.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Page/BackendPage.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Mtf\Page;
+namespace Magento\Mtf\Page;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
/**
* Class BackendPage
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
index 5f87958798d..6083b509f9a 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate;
+namespace Magento\Mtf\Util\Generate;
use Magento\Framework\App;
use Magento\Framework\ObjectManagerInterface;
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
similarity index 94%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
index 5239975f965..df7b6c873c5 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
/**
* Class AbstractFactory
@@ -37,7 +37,7 @@ abstract class AbstractFactory
$this->endFactory($this->type);
- \Mtf\Util\Generate\GenerateResult::addResult($this->type, $this->cnt);
+ \Magento\Mtf\Util\Generate\GenerateResult::addResult($this->type, $this->cnt);
}
abstract protected function generateContent();
@@ -50,15 +50,15 @@ abstract class AbstractFactory
protected function startFactory($type)
{
$this->factoryContent = "<?php\n\n";
- $this->factoryContent .= "namespace Mtf\\{$type}; \n\n";
- $this->factoryContent .= "use Mtf\\Fixture\\FixtureInterface; \n\n";
+ $this->factoryContent .= "namespace Magento\Mtf\\{$type}; \n\n";
+ $this->factoryContent .= "use Magento\Mtf\\Fixture\\FixtureInterface; \n\n";
$this->factoryContent .= "class {$type}FactoryDeprecated\n";
$this->factoryContent .= "{\n";
$this->factoryContent .= " /**
* Object Manager
*
- * @var \\Mtf\\ObjectManager
+ * @var \\Magento\Mtf\\ObjectManager
*/
protected \$objectManager;
@@ -68,7 +68,7 @@ abstract class AbstractFactory
*/
public function __construct()
{
- \$this->objectManager = \\Mtf\\ObjectManager::getInstance();
+ \$this->objectManager = \\Magento\Mtf\\ObjectManager::getInstance();
}\n";
}
@@ -85,11 +85,11 @@ abstract class AbstractFactory
return $this;
}
- $this->checkAndCreateFolder(MTF_BP . "/generated/Mtf/{$type}");
+ $this->checkAndCreateFolder(MTF_BP . "/generated/Magento/Mtf/{$type}");
$this->factoryContent .= "}\n";
- $file = MTF_BP . "/generated/Mtf/{$type}/{$type}FactoryDeprecated.php";
+ $file = MTF_BP . "/generated/Magento/Mtf/{$type}/{$type}FactoryDeprecated.php";
if (false === file_put_contents($file, $this->factoryContent)) {
throw new \RuntimeException("Can't write content to {$file} file");
}
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Block.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Block.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Block.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Block.php
index 24bdbf29f8a..b564d6aca69 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Block.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Block.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
/**
* Class Block
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Fixture.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Fixture.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Fixture.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Fixture.php
index 1d9425f68e1..174a17a2718 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Fixture.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Fixture.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
/**
* Class Fixture
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Handler.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Handler.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Handler.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Handler.php
index c8c0b42a3e5..2dbced547a6 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Handler.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Handler.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
/**
* Class Handler
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Page.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Page.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Page.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Page.php
index b557cb15d2e..c1cb6f22762 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Page.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Page.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
/**
* Class Page
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Repository.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Repository.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Factory/Repository.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Repository.php
index ea6f30c9c8a..79facfdcb13 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Factory/Repository.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Repository.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Factory;
+namespace Magento\Mtf\Util\Generate\Factory;
/**
* Class Repository
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php
similarity index 98%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php
index b0ae3b9eade..fa8923f4ba0 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Fixture/FieldsProvider.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Fixture;
+namespace Magento\Mtf\Util\Generate\Fixture;
use Magento\Framework\App\Resource;
use Magento\Framework\ObjectManagerInterface;
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php
index 5088d06530b..a02df91cb8a 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/CollectionProvider.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Repository;
+namespace Magento\Mtf\Util\Generate\Repository;
use Magento\Framework\ObjectManagerInterface;
@@ -69,7 +69,7 @@ class CollectionProvider implements CollectionProviderInterface
{
$collection = $fixture['collection'];
$collection = $this->objectManager->create($collection, ['fixture' => $fixture]);
- /** @var $collection \Mtf\Util\Generate\Repository\TableCollection */
+ /** @var $collection \Magento\Mtf\Util\Generate\Repository\TableCollection */
return $collection->getItems();
}
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/Resource.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/Resource.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Repository/Resource.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/Resource.php
index 3df60fd5bc9..f366bbc7400 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/Resource.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/Resource.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Repository;
+namespace Magento\Mtf\Util\Generate\Repository;
/**
* Class Resource
diff --git a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php
similarity index 89%
rename from dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php
index 35d36c1a051..9c4ed81e91f 100644
--- a/dev/tests/functional/lib/Mtf/Util/Generate/Repository/TableCollection.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/TableCollection.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Generate\Repository;
+namespace Magento\Mtf\Util\Generate\Repository;
use Magento\Framework\Model\Resource\Db\Collection\AbstractCollection;
@@ -39,7 +39,7 @@ class TableCollection extends AbstractCollection
array $fixture = []
) {
$this->setModel('Magento\Framework\Object');
- $this->setResourceModel('Mtf\Util\Generate\Repository\Resource');
+ $this->setResourceModel('Magento\Mtf\Util\Generate\Repository\Resource');
$resource = $this->getResource();
$resource->setFixture($fixture);
@@ -50,7 +50,7 @@ class TableCollection extends AbstractCollection
/**
* Get resource instance
*
- * @return \Mtf\Util\Generate\Repository\Resource
+ * @return \Magento\Mtf\Util\Generate\Repository\Resource
*/
public function getResource()
{
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlInterface.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlInterface.php
similarity index 96%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/CurlInterface.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlInterface.php
index f3233d88817..63a53a84e1c 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlInterface.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlInterface.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Protocol;
+namespace Magento\Mtf\Util\Protocol;
/**
* Class CurlInterface
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport.php
similarity index 99%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport.php
index 9d1ccb86617..30c20908ed7 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Protocol;
+namespace Magento\Mtf\Util\Protocol;
/**
* HTTP CURL Adapter
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
similarity index 95%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
index a255547319a..5705d52766d 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
@@ -4,11 +4,11 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Protocol\CurlTransport;
+namespace Magento\Mtf\Util\Protocol\CurlTransport;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
/**
* Class BackendDecorator
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
similarity index 96%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
index fbd0aa152d1..97b29483cba 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php
@@ -4,11 +4,11 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Protocol\CurlTransport;
+namespace Magento\Mtf\Util\Protocol\CurlTransport;
use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
/**
* Class FrontendDecorator
diff --git a/dev/tests/functional/lib/Mtf/Util/Protocol/SoapTransport.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/SoapTransport.php
similarity index 97%
rename from dev/tests/functional/lib/Mtf/Util/Protocol/SoapTransport.php
rename to dev/tests/functional/lib/Magento/Mtf/Util/Protocol/SoapTransport.php
index 943a45b9801..8ddeb74e4cd 100644
--- a/dev/tests/functional/lib/Mtf/Util/Protocol/SoapTransport.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/SoapTransport.php
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\Util\Protocol;
+namespace Magento\Mtf\Util\Protocol;
class SoapTransport
{
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index d16c9629371..1bc47ba8998 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -19,14 +19,14 @@
</testsuites>
<listeners>
- <listener class="Mtf\System\Browser\Listener" />
- <listener class="Mtf\System\Isolation\Listener">
+ <listener class="Magento\Mtf\System\Browser\Listener" />
+ <listener class="Magento\Mtf\System\Isolation\Listener">
<arguments>
- <object class="Mtf\System\Isolation\Driver\Base" />
+ <object class="Magento\Mtf\System\Isolation\Driver\Base" />
</arguments>
</listener>
- <listener class="Mtf\System\Event\StateListener" />
- <listener class="Mtf\System\JUnit"/>
+ <listener class="Magento\Mtf\System\Event\StateListener" />
+ <listener class="Magento\Mtf\System\JUnit"/>
</listeners>
<php>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
index a8bc0c1f888..54f750ceeec 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Admin/Login.php
@@ -6,8 +6,8 @@
namespace Magento\Backend\Test\Block\Admin;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class Login
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
index 8e4bddadbb0..c25eac6454d 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php
@@ -6,9 +6,9 @@
namespace Magento\Backend\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
/**
* Class Actions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
index da7112348bd..c74b042f76f 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Denied.php
@@ -6,8 +6,8 @@
namespace Magento\Backend\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Denied
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
index 00ad4106dea..246c3113a8d 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class FormPageActions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
index 4f3aee61055..23cd977b4c2 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Menu.php
@@ -6,7 +6,7 @@
*/
namespace Magento\Backend\Test\Block;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Menu
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
index 530ea9bf4ea..94b36cc6a95 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Header.php
@@ -6,9 +6,9 @@
namespace Magento\Backend\Test\Block\Page;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\GlobalsearchElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\GlobalsearchElement;
/**
* Header block.
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 da9b8ec3376..9de2cdc4349 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
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block\Page;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Main block.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/PageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/PageActions.php
index 1f55b62de53..58e1d53e0ce 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/PageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/PageActions.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class PageActions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
index 980c5d880f0..86ae1d8d66a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php
@@ -7,9 +7,9 @@
*/
namespace Magento\Backend\Test\Block\System\Config;
-use Mtf\Block\Block;
-use Mtf\Factory\Factory;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Client\Locator;
class Form extends Block
{
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
index aee07e2a3f3..0d3244802c7 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php
@@ -8,7 +8,7 @@
namespace Magento\Backend\Test\Block\System\Config\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
use Magento\Backend\Test\Block\Widget\Form;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
index 00f81789c1e..8ed2b6a7bfb 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/PageActions.php
@@ -10,7 +10,7 @@ namespace Magento\Backend\Test\Block\System\Config;
use Magento\Backend\Test\Block\FormPageActions as AbstractPageActions;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class PageActions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
index 1ded412d79b..ac3cce60722 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Delete/Form.php
@@ -6,8 +6,8 @@
namespace Magento\Backend\Test\Block\System\Store\Delete;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form as AbstractForm;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
index 87672eeba74..819e075dbe9 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/GroupForm.php
@@ -6,8 +6,8 @@
namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class GroupForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
index 78ca7212fe8..0d9824e284f 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/StoreForm.php
@@ -6,8 +6,8 @@
namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class StoreForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/WebsiteForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/WebsiteForm.php
index 28a29b48688..cfbfa524c77 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/WebsiteForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/Edit/Form/WebsiteForm.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block\System\Store\Edit\Form;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class WebsiteForm
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
index b1c71f65b2a..f559e6130ec 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
@@ -10,7 +10,7 @@ use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
use Magento\Store\Test\Fixture\Store;
use Magento\Store\Test\Fixture\StoreGroup;
use Magento\Store\Test\Fixture\Website;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class StoreGrid
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Variable/Edit/VariableForm.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Variable/Edit/VariableForm.php
index 0c3ad11e969..2b0c596f1f1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Variable/Edit/VariableForm.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Variable/Edit/VariableForm.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Block\System\Variable\Edit;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php
index 31b67b6b873..5170a9b72ee 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Template.php
@@ -7,7 +7,7 @@
namespace Magento\Backend\Test\Block;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Template
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
index f6cf553fa62..d57bd1aa4d7 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Form.php
@@ -7,10 +7,10 @@
namespace Magento\Backend\Test\Block\Widget;
-use Mtf\Block\Form as FormInstance;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form as FormInstance;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
index 6b0e7faca54..ad1e586f8b6 100755
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php
@@ -6,15 +6,15 @@
namespace Magento\Backend\Test\Block\Widget;
-use Mtf\Block\BlockFactory;
-use Mtf\Block\Mapper;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Client\BrowserInterface;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Util\Iterator\File;
-use Mtf\Util\XmlConverter;
+use Magento\Mtf\Block\BlockFactory;
+use Magento\Mtf\Block\Mapper;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Util\Iterator\File;
+use Magento\Mtf\Util\XmlConverter;
/**
* Class FormTabs
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
index 528fbdac096..3843da95b7b 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
@@ -6,10 +6,10 @@
namespace Magento\Backend\Test\Block\Widget;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Factory\Factory;
/**
* Abstract class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
index 82c770fb510..a4f434313fc 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Tab.php
@@ -6,9 +6,9 @@
namespace Magento\Backend\Test\Block\Widget;
-use Mtf\Block\Form as AbstractForm;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
/**
* Class Tab
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 999eb88ce4e..70e2cf29fb4 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
@@ -8,7 +8,7 @@ namespace Magento\Backend\Test\Constraint;
use Magento\Backend\Test\Fixture\GlobalSearch;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertGlobalSearchCustomerName
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 8b14b75af7c..69a2652ce24 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
@@ -7,7 +7,7 @@
namespace Magento\Backend\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertGlobalSearchNoRecordsFound
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 cc0af65d028..4f78438f27c 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
@@ -8,7 +8,7 @@ namespace Magento\Backend\Test\Constraint;
use Magento\Backend\Test\Fixture\GlobalSearch;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertGlobalSearchOrderId
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 5c32c84fb1f..4e477ff193c 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
@@ -9,7 +9,7 @@ namespace Magento\Backend\Test\Constraint;
use Magento\Backend\Test\Fixture\GlobalSearch;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertGlobalSearchProductName
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php
index 017da4d2aca..2a519151087 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Fixture\Admin;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\DataFixture;
/**
* Class SuperAdmin
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php
index e9f9c69db99..12c06f560e7 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Date.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Fixture;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Date
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php
index a32966711b5..d4f4890694a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class GlobalSearch
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php
index 2c7de345435..3f14768fb45 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php
@@ -6,9 +6,9 @@
namespace Magento\Backend\Test\Fixture\GlobalSearch;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Query
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php
index 527fa524e21..ce80fa82d40 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Conditions.php
@@ -6,7 +6,7 @@
namespace Magento\Backend\Test\Handler;
-use Mtf\Handler\Curl;
+use Magento\Mtf\Handler\Curl;
/**
* Class Conditions
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php
index 9346e1203a5..6e980ea374c 100755
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php
@@ -7,10 +7,10 @@
namespace Magento\Backend\Test\Handler;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Extractor
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
index 7589e2bddd6..51cc5e3ab6f 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LoginUser.php
@@ -6,9 +6,9 @@
namespace Magento\Backend\Test\Handler\Ui;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Ui;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Ui;
/**
* Class LoginUser
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LogoutUser.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LogoutUser.php
index e774b6dc7fd..9ffe8a5665b 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LogoutUser.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui/LogoutUser.php
@@ -7,9 +7,9 @@
namespace Magento\Backend\Test\Handler\Ui;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Ui;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Ui;
/**
* Class LogoutUser
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
index 3020764a452..c53ef25e6dc 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
@@ -5,9 +5,9 @@
*/
namespace Magento\Backend\Test\Page;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
/**
* Class AdminAuthLogin
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 073ce6fcde7..71c85156978 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
@@ -7,7 +7,7 @@
namespace Magento\Backup\Test\Constraint;
use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertBackupInGrid
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 21cb7fb9395..12d9fc7f39e 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -7,9 +7,9 @@
namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element;
/**
* Class Bundle
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index c7e342e81c5..b3286de48a5 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle;
use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Search\Grid;
use Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class Option
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index f7e96753e9e..5d213baa8b4 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -6,7 +6,7 @@
namespace Magento\Bundle\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class Selection
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php
index f34696966fd..af5173612c1 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,7 +7,7 @@
namespace Magento\Bundle\Test\Block\Adminhtml\Product\Composite;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Configure
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
index bee98cdd38b..5f99ab3bce3 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View.php
@@ -8,9 +8,9 @@ namespace Magento\Bundle\Test\Block\Catalog\Product;
use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Bundle;
use Magento\Bundle\Test\Fixture\BundleProduct;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class View
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
index 43b9016d072..137eadb438b 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Bundle.php
@@ -10,11 +10,11 @@ use Magento\Bundle\Test\Fixture\Bundle as BundleDataFixture;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Bundle
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option.php
index 9a9427361df..1d3c35ccece 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Block/Catalog/Product/View/Type/Option.php
@@ -9,7 +9,7 @@
namespace Magento\Bundle\Test\Block\Catalog\Product\View\Type;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class Option
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 e808b34f92e..d05b7beb50e 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
@@ -10,7 +10,7 @@ use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 ee30f2933d3..a7ceb39b65a 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
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertBundleItemsOnProductPage
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 98ed0719aab..22e4f9c693a 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
@@ -9,8 +9,8 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertBundlePriceType
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 41b921dc2d0..d4e8779a778 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
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Check displayed price view for bundle product on product page.
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductInCustomerWishlistOnBackendGrid.php
index f512ad01556..868112dce9f 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductInCustomerWishlistOnBackendGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertBundleProductInCustomerWishlistOnBackendGrid
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertGroupedPriceOnBundleProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertGroupedPriceOnBundleProductPage.php
index 4f431b4a0c1..da18ba61b48 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertGroupedPriceOnBundleProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertGroupedPriceOnBundleProductPage.php
@@ -8,7 +8,7 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Catalog\Test\Block\Product\View;
use Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertGroupedPriceOnBundleProductPage
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 3a549206fdf..3c62ea1c4ea 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
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertTierPriceOnBundleProductPage
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
index 092be30151c..082ce5fa3db 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
@@ -7,8 +7,8 @@
namespace Magento\Bundle\Test\Fixture;
use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
/**
* Class Bundle
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php
index 05619530cf7..18f692eeda8 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php
@@ -6,7 +6,7 @@
namespace Magento\Bundle\Test\Fixture;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
/**
* Class BundleDynamic
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php
index 903a8da05d0..3cebc6dfa36 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleFixed.php
@@ -6,7 +6,7 @@
namespace Magento\Bundle\Test\Fixture;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
/**
* Class BundleFixed
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php
index 9745ac6b032..399f0184150 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.php
@@ -6,12 +6,12 @@
namespace Magento\Bundle\Test\Fixture;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
/**
* Class BundleProduct
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php
index 02d987d9eb3..b3d46087acd 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php
@@ -6,8 +6,8 @@
namespace Magento\Bundle\Test\Fixture\BundleProduct;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class BundleSelections
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php
index d155c6236f7..33965ee8bdf 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php
@@ -6,7 +6,7 @@
namespace Magento\Bundle\Test\Fixture\BundleProduct;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Price
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php
index 8ecfd8c910f..89bab0c1b7e 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
namespace Magento\Bundle\Test\Fixture\Cart;
use Magento\Bundle\Test\Fixture\BundleProduct;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/BundleProductInterface.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/BundleProductInterface.php
index c1f62b99914..d53e765d8c0 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/BundleProductInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/BundleProductInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Bundle\Test\Handler\BundleProduct;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface BundleProductInterface
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php
index e5f194127e9..c7746327b72 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php
@@ -8,8 +8,8 @@ namespace Magento\Bundle\Test\Handler\BundleProduct;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as ProductCurl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
/**
* Create new bundle product via curl.
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php
index 2b93aaf4b95..31abf5c1547 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php
@@ -7,12 +7,12 @@
namespace Magento\Bundle\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class CreateBundle
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php
index 7f91b0f2ae9..7e3ea715cca 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.php
@@ -6,7 +6,7 @@
namespace Magento\Bundle\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class BundleProduct
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php
index 42af8b78cc8..fcdff4b9407 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleDynamicTest.php
@@ -7,8 +7,8 @@
namespace Magento\Bundle\Test\TestCase;
use Magento\Bundle\Test\Fixture\Bundle;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class BundleDynamicTest
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php
index cbc2227fd0e..ba309fcd6ed 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/BundleFixedTest.php
@@ -7,8 +7,8 @@
namespace Magento\Bundle\Test\TestCase;
use Magento\Bundle\Test\Fixture\Bundle;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class BundleFixedTest
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
index d39be09dbb6..3dc5fec8c7a 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateBundleProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php
index 6e466a1f809..f4592e21dda 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/EditBundleTest.php
@@ -7,8 +7,8 @@
namespace Magento\Bundle\Test\TestCase;
use Magento\Bundle\Test\Fixture\Bundle;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class EditBundleTest
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
index aeddf4bcaae..e2ab1af866a 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Bundle\Test\TestCase;
use Magento\Bundle\Test\Fixture\BundleProduct;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Update BundleProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractConfigureBlock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractConfigureBlock.php
index e291635c52f..148e06c61fa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractConfigureBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/AbstractConfigureBlock.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Block;
use Magento\Catalog\Test\Block\Product\View\CustomOptions;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Block\Form;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AbstractConfigureBlock
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
index 27aac4a235e..4a1ba08b856 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit;
use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
/**
* Class CategoryForm
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
index 5b5054cda3d..3f29be8ab7f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Tab/Product.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Catalog\Test\Block\Adminhtml\Category\Tab\ProductGrid;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index a4681d4df89..15a87f2de91 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -8,11 +8,11 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Category;
use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Client\Element\TreeElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\TreeElement;
/**
* Class Tree
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
index 4a0c63728c0..160116b7518 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Widget/Chooser.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Category\Widget;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class CategoryChooser
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
index c3594ae9718..75a6c1b1c89 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
@@ -8,10 +8,10 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Edit attribute form on catalog product edit page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
index 031a6143208..4dfc6d203b3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Catalog product custom attribute element.
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 30e2266fda2..0a3a1b52f4a 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
@@ -8,11 +8,11 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Catalog Product Attribute form.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
index 400cc754393..3e5a6fd3355 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Options.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
-use Mtf\ObjectManager;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options\Option;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index b0dbd7d65ac..b1091273427 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
/**
* Class AdvancedPropertiesTab
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
index 09996767ee7..37bf323fa12 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
/**
* Class Options
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.php
index 6918f41b767..062ac3c4a35 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/Tab/Options/Option.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit\Tab\Options;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class Option
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 5d085db1b67..47a2e261ba1 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
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Main
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php
index 4d034090adf..ef673d484b7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/AttributeSetForm.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main;
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Block\Form as AbstractForm;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/EditForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/EditForm.php
index 6f9dc7e7be3..9dcc851e7f9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/EditForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/EditForm.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Set\Main;
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Block\Form as AbstractForm;
/**
* Class EditForm
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
index a1419eb6eb9..bd6988a5afe 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,9 +7,9 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Composite;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Block\AbstractConfigureBlock;
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 bcec82a633d..d6943bf14db 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action;
use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Product attribute massaction edit page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
index 6d89bb37601..269e53dfcba 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class AdvancedPricingTab
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
index c539fb92cec..36ea46aaff0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionGroup.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\AdvancedPricingTab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class OptionField
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
index 9c405921972..7dc90c88899 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/AdvancedPricingTab/OptionTier.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\AdvancedPricingTab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class OptionTier
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 935f79fe52d..c7c48a1847c 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
index a584ce5f69f..e23a8abf1ad 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class AbstractRelated
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index c430866c70a..fac0fe3f9fb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Attributes;
-use Mtf\Client\Element\SuggestElement;
+use Magento\Mtf\Client\Element\SuggestElement;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index 23a18775135..ea40e9576f8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -8,7 +8,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Crosssell\Grid as CrosssellGrid;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Crosssell
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
index 1657d20cc40..e1782ef6ca1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options.php
@@ -7,10 +7,10 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\Search\Grid;
-use Mtf\ObjectManager;
-use Mtf\Client\Locator;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Client\Locator;
/**
* Class Options
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
index 05bed7630c9..55af1526e62 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/AbstractOptions.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Backend\Test\Block\Widget\Tab;
/**
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 3eca8eb7415..bf958e52b0a 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\Type;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Form "Option dropdown" on tab product "Custom options".
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
index a78b3fef4db..546719a20d4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
/**
* Product details tab.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
index 5e581084680..56d6b46ed62 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/AttributeSet.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
-use Mtf\Client\Element\SuggestElement;
+use Magento\Mtf\Client\Element\SuggestElement;
/**
* Class AttributeSet
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 2387a6ee456..0e45e4c6cdd 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
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\MultisuggestElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\MultisuggestElement;
/**
* Typified element class for category element.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
index 2b43fa76d62..55f800b3f67 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/ProductOnlineSwitcher.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class ProductOnlineSwitcher
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
index abeb2849647..78298efb56a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -8,7 +8,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related\Grid as RelatedGrid;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Related
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index b63f90d4429..f3d4ff8f8bc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -8,7 +8,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell\Grid as UpsellGrid;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Upsell
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
index 9ab4508f1e3..f9b1f1a92be 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Websites/StoreTree.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Websites;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class StoreTree
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
index 957c9273591..9778f9a4b34 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/FormPageActions.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product;
use Magento\Backend\Test\Block\FormPageActions as ParentFormPageActions;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class FormAction
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
index d35d5292d71..bafda38e5f5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/GridPageAction.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Block\Adminhtml\Product;
use Magento\Backend\Test\Block\GridPageActions as ParentGridPageActions;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class GridPageAction
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 eb1b40fb87e..51df922610d 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
@@ -11,14 +11,14 @@ use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\AttributeForm;
use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\CustomAttribute;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab;
use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\DataFixture;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Product form on backend product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php
index ae9a508fb56..7051e8d5372 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Category;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class ProductPagination
@@ -26,7 +26,7 @@ class ProductPagination extends Block
/**
* Getting the active element to go to the next page
*
- * @return \Mtf\Client\Element|null
+ * @return \Magento\Mtf\Client\Element|null
*/
public function getNextPage()
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
index 844e537f2f8..b8c85e290dd 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/View.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Block\Category;
use Magento\Widget\Test\Fixture\Widget;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class View
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
index 875657a1feb..fdfbc654c12 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Additional.php
@@ -6,11 +6,11 @@
namespace Magento\Catalog\Test\Block\Product;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
/**
* Product additional information block on the product page.
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 161638635b3..22c7b8213d2 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
@@ -6,10 +6,10 @@
namespace Magento\Catalog\Test\Block\Product\Compare;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Compare list product block.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
index 73bae6656ae..59f48c60913 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts.php
@@ -7,10 +7,10 @@
namespace Magento\Catalog\Test\Block\Product\Grouped;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
/**
* Class AssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index af5dc96d528..51fba6b4440 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -6,10 +6,10 @@
namespace Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Factory\Factory;
/**
* Class ListAssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
index 6a06c92fb6e..80f0b1d6b8b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Product
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
index ce2bf986a1a..4415fec2ac0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php
@@ -6,10 +6,10 @@
namespace Magento\Catalog\Test\Block\Product;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Factory\Factory;
/**
* Product list.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
index 68f4197cafb..39ea6ff8c38 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php
@@ -5,9 +5,9 @@
*/
namespace Magento\Catalog\Test\Block\Product;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Price
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php
index e5866a521d3..7bbe9c2d761 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Product\ProductList;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class BottomToolbar
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
index dc858eee1d8..9b5d42d49b9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Crosssell.php
@@ -6,10 +6,10 @@
namespace Magento\Catalog\Test\Block\Product\ProductList;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Catalog\Test\Fixture\Product;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
index 90922b213e8..dd65782e9f2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Related.php
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\Block\Product\ProductList;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Related
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
index 4090f15dc36..7f53f190bd4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Block\Product\ProductList;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class TopToolbar
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
index 1b54233f438..ce1ee095156 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/Upsell.php
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\Block\Product\ProductList;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Upsell
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
index 40f8ea6e25d..b658bb823cd 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Block\Product;
use Magento\Catalog\Test\Block\AbstractConfigureBlock;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Product view block on the product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 72f128f70ea..ea07ff104aa 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -6,11 +6,11 @@
namespace Magento\Catalog\Test\Block\Product\View;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class CustomOptions
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
index 86102bbac90..2257512b72f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Search
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 4174cb6d23e..3c017e29dab 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAbsenceDeleteAttributeButton
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 71992451111..4aad21571bd 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
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAddToCartButtonAbsent
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 470580cddbf..b779f7a8eaa 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
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAddToCartButtonPresent
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 2fa65b17147..a5ffd6438ac 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,12 +8,12 @@ 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\Mtf\Fixture\InjectableFixture;
+use Magento\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;
+use Magento\Mtf\ObjectManager;
/**
* Check attribute on product form.
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 f6bf4105907..d559f1386cd 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
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* 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 7ce9ed37e46..5d8898934c1 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAttributeOptionsOnProductForm
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 0497a340736..f79f14a6689 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAttributeSearchableByLabel
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 3668858b2a9..16be1cbf6e0 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCategoryAbsenceOnBackend
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 9ba88c2a3af..f4c2b6530a7 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
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCategoryAbsenceOnFrontend
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 f049debd229..f81d4b389d2 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
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCategoryForAssignedProducts
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 c0bf8c3bb07..06d7ce4fe0a 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
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Assert that displayed category data on edit page equals passed from fixture.
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 73b62e396df..b83d2fd8599 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
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCategoryIsNotActive
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 5a468a0b2ff..07b23794984 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
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCategoryIsNotIncludeInMenu
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 05175fa7ebb..3197b59c3d5 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
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Fixture\Category\LandingPage;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* 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 ca0bce01e8e..3c72fa66599 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCategoryRedirect
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 37150e69985..95552645afe 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCategorySaveMessage
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 898a92ea6d2..2f0348ef51d 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCategorySuccessDeleteMessage
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 360233913f1..b6a8c8c559f 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
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertCrossSellsProductsSection
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 7fec659f98b..9ba318c3a3f 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
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertNoCrossSellsProductsSection
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 c3eac37c87c..77dafc88946 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertNoRelatedProductsSection
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 10e60aacbc2..e2ec0224da5 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertNoUpSellsProductsSection
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPriceOnProductPageInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPriceOnProductPageInterface.php
index 391b2394ceb..e26cb9d0dfe 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPriceOnProductPageInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertPriceOnProductPageInterface.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Block\Product\View;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Interface AssertPriceOnProductPageInterface
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 f7d97ff7c1b..1091df6e8b2 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAbsenceProductAttributeInGrid
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 a0eb096a1b0..3cf4328573e 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
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAbsenceInAddAttributeSearch
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 7393939c7e7..178bdd40780 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
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductAttributeAbsenceInTemplateGroups
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 517a00547fa..7131b704c9c 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
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductAttributeAbsenceInUnassignedAttributes
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 11ec8c330fc..a7f562305a0 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* 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 4c1b3d5a125..1d9a0a73cf0 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\CatalogSearch\Test\Page\AdvancedSearch;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 5247acf20d0..4f76dc4d50d 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductAttributeInGrid
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 ea8a2fb6713..bc4a1c23c9e 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
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* 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 343dce13148..bd3c2262147 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
@@ -6,10 +6,10 @@
namespace Magento\Catalog\Test\Constraint;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
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 fd0e4173327..d43006c06f6 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
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* 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 7db85843f97..486497d81c9 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 1ee1e91f870..33b93ac4f1e 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Check whether html tags are using in an 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 fcd98a85b6d..d563b8966aa 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
@@ -9,8 +9,8 @@ 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 Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* 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 9d33cbdf8f9..ca35c959794 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
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* 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 4af9bd95be9..73d9c93fdf2 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
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* 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 3dca6021de3..cda2dbe885c 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductAttributeIsUsedPromoRules
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 b6c11594ab6..f58f02ad1f4 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductAttributeSaveMessage
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 ea2adf5025f..60b68f622cb 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSuccessDeletedAttribute
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 bdaf461656d..5388bf823b4 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
@@ -7,9 +7,9 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* Class AssertProductCompareBlockOnCmsPage
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 d54776b16ee..716bb8c0093 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductCompareItemsLink
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 1deb79c236d..3455b8dad45 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductCompareItemsLinkIsAbsent
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 bd023344378..c08c1850494 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductComparePage
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 3a6fb000b07..0ede4a57e7b 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductCompareRemoveLastProductMessage
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 38875701b97..733c8b72659 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductCompareSuccessAddMessage
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 5f0f8266ff3..4c878871b76 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductCompareSuccessRemoveAllProductsMessage
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 f78b2770a04..434daafcee8 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductCompareSuccessRemoveMessage
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 9b2a635d653..7150626d7dc 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
@@ -7,9 +7,9 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductCustomOptionsOnProductPage
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 a26e9b5d4f3..51da2a9c5d3 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* 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 c27dcb38930..89f7eaae399 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
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductDuplicateIsNotDisplayingOnFrontend
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 3abcce7a600..837fb1ebdb2 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductDuplicateMessage
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 278786c42b5..4adca9c9b7b 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductDuplicatedInGrid
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 efbdc1f4aa1..e10767e1eb6 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
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductForm
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 bf7b21c6281..bfd4ea2306d 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Block\Product\View;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductGroupedPriceOnProductPage
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 81b7aa62c95..c231814db8b 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
@@ -9,9 +9,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductInCart
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 63fcbcf8007..ea20ef12903 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
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductInCategory
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 7f12ecab2f3..b2a87f0ee3e 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductInGrid
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 ca7813a34e8..b00dc4d1713 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
@@ -7,9 +7,9 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductInStock
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 1b2f8fba221..f53f723ebc2 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
@@ -11,9 +11,9 @@ use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductIsNotDisplayingOnFrontend
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 8785c154add..e0cd14a071e 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
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductIsNotVisibleInCompareBlock
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 ddbba15320b..65205e252f7 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductIsNotVisibleInComparePage
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 342c6113967..d973f1ae0bc 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductNotInGrid
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 e3963b136f1..bf5fe7db227 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
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductNotSearchableBySku
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 a96967889aa..cb885fcee6f 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
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductNotVisibleInCategory
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 0b80ebe44bb..9aeec7495e1 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
@@ -7,9 +7,9 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductOutOfStock
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 ff401913e52..23e31de68ca 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductPage
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 2d2e0ff69f5..7f972607e95 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductSaveMessage
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 118a0aedf71..337aec58a57 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
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductSearchableBySku
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 985b0e30d23..cfeed99f470 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductSkuAutoGenerated
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 5bed77b3a43..4a4df8f12a0 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Block\Product\View;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Assert that displayed special price on product page equals passed from fixture.
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 408d2aea57d..0be5aaf2f66 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductSuccessDeleteMessage
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 d5d4beaf5ba..af751de70b6 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
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductTemplateForm
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 87d0c910598..d207b3b1a35 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
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\Constraint;
-use Mtf\ObjectManager;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
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 1a616f41bc6..6c5f5a361f8 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductTemplateInGrid
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 870fa371f97..6169fe31598 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
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductTemplateNotInGrid
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 378370a4524..34dbf3c2914 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
@@ -12,8 +12,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* Class AssertProductTemplateOnProductForm
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 1308b188bc0..8fe292c2423 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductTemplateSuccessDeleteMessage
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 cc06f1cce7c..e19ff627456 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductTemplateSuccessSaveMessage
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 ef322cf1ee3..94702a94536 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Block\Product\View;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Assert that displayed tier price on product page equals passed from fixture.
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 9b93ddcd2f0..52bfc9299be 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
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductView
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 a58ede70359..c8167af1480 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
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductVisibleInCategory
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 f762b48b227..c2279cf6a73 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertRelatedProductsSection
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 35fbfcf3a3b..0dae93dd6d2 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
@@ -7,10 +7,10 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertUpSellsProductsSection
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 133d2e28910..8bb9e412214 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUsedSuperAttributeImpossibilityDeleteMessages
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
index e1c04547aa3..47ba4a555e5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
class AssignProducts extends Product
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php
index 1d977962b2e..9e8d1996b13 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Fixture\Cart;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php
index 4a3c8f5da9c..21cf68bc8a8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class CatalogAttributeSet
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/AssignedAttributes.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/AssignedAttributes.php
index fe38371d7ab..3cab1236414 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/AssignedAttributes.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/AssignedAttributes.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssignedAttributes
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php
index 4d70dd528ea..27f86800767 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet/SkeletonSet.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class SkeletonSet
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php
index db403b73608..4d645477ec2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class CatalogAttributeEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php
index fce3250d3d7..f05c63c30d7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute/Options.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Options
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 4c988324e04..ffaa24098d3 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
@@ -6,12 +6,12 @@
namespace Magento\Catalog\Test\Fixture;
-use Mtf\System\Config;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Event\EventManagerInterface;
/**
* Class CatalogProductSimple
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php
index 7d041eb90f1..b1ffd032219 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AbstractRelatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php
index 17faa3b5b06..28b6e17750a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AttributeSetId.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AttributeSetId
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CategoryIds.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CategoryIds.php
index 9453ec0828e..cf59c0bc7a1 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CategoryIds.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CategoryIds.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class CategoryIds
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php
index ac5d1798095..6cabd44b50e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CheckoutData.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class CheckoutData
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomAttribute.php
index 49d6a01d0c0..024e8bc7680 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomAttribute.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Source for attribute field.
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 733a611b3cb..82d498b27c0 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
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class CustomOptions
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Fpt.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Fpt.php
index 5e84f8822e5..8d29bd7bd8b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Fpt.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Fpt.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Fpt
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
index 256bb41cb82..096fa2fd20d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/GroupPriceOptions.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class GroupPriceOptions
@@ -19,7 +19,7 @@ use Mtf\Fixture\FixtureInterface;
class GroupPriceOptions implements FixtureInterface
{
/**
- * @var \Mtf\Fixture\FixtureFactory
+ * @var \Magento\Mtf\Fixture\FixtureFactory
*/
protected $fixtureFactory;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Price.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Price.php
index 9c68b4060f2..470558b5d4d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Price.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/Price.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Price
@@ -33,7 +33,7 @@ class Price implements FixtureInterface
protected $params;
/**
- * @var \Mtf\Fixture\FixtureFactory
+ * @var \Magento\Mtf\Fixture\FixtureFactory
*/
protected $fixtureFactory;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php
index 0d5b1c9981a..bfec8539bb6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php
@@ -7,12 +7,12 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Tax\Test\Fixture\TaxClass as FixtureTaxClass;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class TaxClass
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TierPriceOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TierPriceOptions.php
index 4dbc4be608d..1d2c292ec6e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TierPriceOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TierPriceOptions.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class TierPriceOptions
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php
index 997b81fbbda..c7102655fe9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.php
@@ -6,12 +6,12 @@
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
/**
* Class CatalogProductVirtual
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php
index d27ae4c345b..c159bb8f739 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class CatalogCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php
index c84d694e909..1230c6c9654 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\Fixture\Category;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class CategoryProducts
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php
index b8110cfe174..add0a7c40e1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Fixture\Category;
use Magento\Cms\Test\Fixture\CmsBlock;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Prepare landing page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
index 57c0c0e49ee..7075706983b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class ParentId
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php
index 9f8bfc89254..6314c21b52c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CrosssellProducts.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Fixture;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Crosssell;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
class CrosssellProducts extends AssignProducts
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
index ba65b0bb50c..ca49dbcb874 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
@@ -5,10 +5,10 @@
*/
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
-use Mtf\ObjectManager;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\System\Config;
class Product extends DataFixture
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
index 9ae108402b3..e0bcf99fe40 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/ProductAttribute.php
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
/**
* Class Attribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
index 43a32cb5864..29ce1edf925 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
@@ -5,8 +5,8 @@
*/
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
/**
* Class SimpleProduct
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/VirtualProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/VirtualProduct.php
index 35057a1f722..be101be7e28 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/VirtualProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/VirtualProduct.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Fixture;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
class VirtualProduct extends Product
{
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php
index fb00c52d4d9..da04410ef23 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/CatalogAttributeSetInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Handler\CatalogAttributeSet;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CatalogCategoryEntityInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php
index 6e33e1ee8ac..869c7507cda 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php
@@ -7,12 +7,12 @@
namespace Magento\Catalog\Test\Handler\CatalogAttributeSet;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php
index 1a5221e0501..de29b27f945 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/CatalogProductAttributeInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Handler\CatalogProductAttribute;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CatalogCategoryEntityInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
index 9d3652fe978..fb0e7437711 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Catalog\Test\Handler\CatalogProductAttribute;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/CatalogProductSimpleInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/CatalogProductSimpleInterface.php
index f4df1f92896..f705cfd88f2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/CatalogProductSimpleInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/CatalogProductSimpleInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Handler\CatalogProductSimple;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CatalogProductSimpleInterface
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 0f7a8b1dd6b..c6ee44d2d0c 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
@@ -6,12 +6,12 @@
namespace Magento\Catalog\Test\Handler\CatalogProductSimple;
-use Mtf\System\Config;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Create new simple product via curl.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Ui.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Ui.php
index e3b8421cc3e..1e3631bc057 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Ui.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Ui.php
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\Handler\CatalogProductSimple;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Ui as AbstractUi;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Ui as AbstractUi;
/**
* Class CreateProduct
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductVirtual/CatalogProductVirtualInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductVirtual/CatalogProductVirtualInterface.php
index 67a4bf6cfff..d9cc8dff4df 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductVirtual/CatalogProductVirtualInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductVirtual/CatalogProductVirtualInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Handler\CatalogProductVirtual;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CatalogProductVirtualInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/CategoryInterface.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/CategoryInterface.php
index adfdcb62c0a..d63688100a2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/CategoryInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/CategoryInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Handler\Category;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CategoryInterface
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php
index 030d3bbae3b..0e8c6e7fd42 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Catalog\Test\Handler\Category;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php
index 6f3040413d8..1205d69fa11 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php
@@ -7,13 +7,13 @@
namespace Magento\Catalog\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class CreateProduct
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProductAttribute.php
index f2873e71543..18a8f3598f0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProductAttribute.php
@@ -8,12 +8,12 @@
namespace Magento\Catalog\Test\Handler\Curl;
use Magento\Catalog\Test\Fixture\ProductAttribute;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class CreateProductAttribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Ui/CreateProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Ui/CreateProduct.php
index 1533bae18f6..acabe4b5e64 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Ui/CreateProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Ui/CreateProduct.php
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\Handler\Ui;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Ui;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Ui;
/**
* Class CreateProduct
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
index 06155fa4297..43666299a1a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\Page\Category;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
/**
* Class CatalogCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
index 052b360b14a..f7bcf562cd9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php
@@ -7,9 +7,9 @@
namespace Magento\Catalog\Test\Page\Category;
use Magento\Backend\Test\Block\FormPageActions;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
/**
* Class CatalogCategoryEdit
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
index b29d69f56c7..96ffb35c545 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Product/CatalogProductActionAttributeEdit.php
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\Page\Product;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
/**
* Class CatalogProductActionAttributeEdit
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/AssignProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/AssignProducts.php
index cfe500f811c..9d31fe311d9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/AssignProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/AssignProducts.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Product Repository
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php
index 87da5eb4b6f..1bba2984d00 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class CatalogProductTemplate
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php
index fc5aacdd8e4..0c274785757 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class CatalogProductAttribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php
index 43ee2aadb8f..de287058e44 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Data for creation Catalog Product Simple.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php
index fd43d3c3aa3..d62d7b3ddb5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class CatalogProductVirtual
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php
index ecb9febd09a..61b458e067e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class CatalogCategory
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php
index 7e83c80ef20..4c9b8591ac0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\Repository;
use Magento\Catalog\Test\Fixture;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Product Repository
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ProductAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ProductAttribute.php
index 500c30275b0..607a80eea4e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ProductAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ProductAttribute.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Product Attribute Repository
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
index 232fd29cfc8..ed8172c2fe9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\Category;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateCategoryEntity
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 4148746b6e2..85496befeb3 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
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\Category;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteCategoryEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
index 8362d31c4fb..7b43b018904 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\Category;
use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateCategoryEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php
index 6865d2fad80..c0200a2ccb2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractAddRelatedProductsEntityTest.php
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestCase\Injectable;
/**
* Class AbstractAddRelatedProductsEntityTest
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 7cc92323a57..b8bcce9c6c7 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
@@ -11,11 +11,11 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountLogin;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\TestCase\Injectable;
/**
* Abstract class for compare products class.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php
index 209fb3f589c..251ff8c60d3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateProductTest.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Fixture\SimpleProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class CreateProductTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
index 19bb0fa8f7b..02044246737 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateSimpleProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php
index bef726b3adb..01f3fecddca 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCategoryTest.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Fixture\SimpleProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class CreateSimpleWithCategoryTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php
index 9cc4424bf05..1f6c1e41b6f 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleWithCustomOptionsAndCategoryTest.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class CreateSimpleWithCustomOptionsAndCategoryTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php
index 5eba6633509..b168b568d24 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Fixture\SimpleProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class CreateTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php
index c3662e3f685..b7e1955b146 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Fixture\CatalogProductVirtual;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateVirtualProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php
index 473a7a2599a..7e966ab4371 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualTest.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Fixture\VirtualProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class CreateTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CrosssellTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CrosssellTest.php
index 0a454ded8bc..2f71f814a2a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CrosssellTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CrosssellTest.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class CrosssellTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php
index b03a0cf4e53..75898fccf9a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/EditSimpleProductTest.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Fixture\SimpleProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Edit products
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
index 9b35f9081b3..1cdff9dbf0e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for ProductTypeSwitchingOnCreation
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
index c1b821dedef..7448eb5eb32 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
use Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for ProductTypeSwitchingOnUpdating
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/RelatedProductTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/RelatedProductTest.php
index 448e534fdab..2dce365a7bc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/RelatedProductTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/RelatedProductTest.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Related;
use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class RelatedProductTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php
index 69ca4b005de..bf024a2a2a4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UnassignCategoryTest.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class UnassignCategoryTest
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php
index 248bd5a6a71..33125f9bdff 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateProductSimpleEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
index f3bfd46975f..0868765d7b5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Fixture\CatalogProductVirtual;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateVirtualProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpsellTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpsellTest.php
index b8e7bb4e70b..23d3a2a5813 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpsellTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpsellTest.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\TestCase\Product;
use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Upsell;
use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class UpsellTest
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 aca4fb8a4fc..7ddb966ed99 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
@@ -11,7 +11,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetAdd;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateAttributeSetEntity
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 0dfee0e266d..d17441b09b1 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
@@ -8,9 +8,9 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Scenario;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Scenario;
/**
* Test Flow:
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 c863602bbcd..aa04e94af83 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
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestCase\ProductAttribute;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Scenario;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Scenario;
/**
* Test Creation for CreateProductAttributeEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php
index ef01e486b83..5a717e86f09 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAssignedToTemplateProductAttributeTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Delete Attribute Set (Product Template)
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 86b4b2db53f..5e88db04c3c 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
@@ -9,8 +9,8 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Delete Attribute Set (Product Template)
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
index 0375978ad72..7303aaf305c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateProductAttributeEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php
index ccb1ccadf1b..5bf2a74ee1e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteSystemProductAttributeTest.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\TestCase\ProductAttribute;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Cover DeleteSystemProductAttribute with functional tests designed for automation
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php
index 7437d0e488d..9485ebe8e08 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteUsedInConfigurableProductAttributeTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Delete Used in Configurable ProductAttribute
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 dc1e25e7703..0939c76aadb 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
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateAttributeSetTest
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 a8f77b33c44..b9e8ed962b3 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
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateProductAttributeEntity
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php
index 2224e63068c..ef52d2a94f0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Move attribute To attribute set.
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 5c220ce185d..58d29f12e4d 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
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Add custom attribute to product from product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeStep.php
index 84d3f05f7ad..4b446c35fab 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeStep.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Add New Attribute from Attribute index page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
index 299dc6d37bf..ad7ed5c25be 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductStep.php
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\TestStep;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Create product using handler.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductTemplateStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductTemplateStep.php
index 7464f5c1d19..e8b106042af 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductTemplateStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductTemplateStep.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Create product attribute template using handler.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php
index 914c92bd68d..74adfb27e10 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php
@@ -6,9 +6,9 @@
namespace Magento\Catalog\Test\TestStep;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class CreateProductsStep
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/DeleteAttributeStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/DeleteAttributeStep.php
index b485cf5956b..0c028ca6a48 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/DeleteAttributeStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/DeleteAttributeStep.php
@@ -9,7 +9,7 @@ namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Delete product attribute.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormOnProductPageStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormOnProductPageStep.php
index 63b6c188f1a..2d867c8aaa5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormOnProductPageStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormOnProductPageStep.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Fill custom attribute form on product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormStep.php
index b00e58a291f..265871d80b6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/FillAttributeFormStep.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Fill attribute form on attribute page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductAttributesPageStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductAttributesPageStep.php
index a357b802340..39f35eef6a5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductAttributesPageStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductAttributesPageStep.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Open Product Attribute Index Page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductOnBackendStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductOnBackendStep.php
index 99cacb3269e..d6f6f73cd5b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductOnBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductOnBackendStep.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Open product on backend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
index ccba37cb304..cae7f71355d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/OpenProductsOnFrontendStep.php
@@ -6,8 +6,8 @@
namespace Magento\Catalog\Test\TestStep;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Open products on frontend via url.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeOnProductPageStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeOnProductPageStep.php
index 5cccb4c6a34..38d6ebdf1b5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeOnProductPageStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeOnProductPageStep.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Click "Save" button on attribute form on product page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php
index 60b9acf32ac..0651b72bc37 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Save attribute on attribute page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductStep.php
index d592470490c..9d1e5d89968 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductStep.php
@@ -7,8 +7,8 @@
namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Save product step.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductTemplateStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductTemplateStep.php
index 09f46665104..759f036f3f8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductTemplateStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveProductTemplateStep.php
@@ -7,7 +7,7 @@
namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Save attributeSet on attribute set page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SetDefaultAttributeValueStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SetDefaultAttributeValueStep.php
index 1f1c6a2b71b..7ab1e215e9c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SetDefaultAttributeValueStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SetDefaultAttributeValueStep.php
@@ -8,8 +8,8 @@ namespace Magento\Catalog\Test\TestStep;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Set default attribute value.
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 07d18daff56..9ad414f26cb 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
@@ -10,7 +10,7 @@
<severity>high</severity>
<require>
<productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductInGrid>
<assertProductSaveMessage module="Magento_Catalog">
@@ -23,14 +23,14 @@
<severity>low</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductOutOfStock>
<assertProductInStock module="Magento_Catalog">
<severity>low</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductInStock>
<assertProductVisibleInCategory module="Magento_Catalog">
@@ -39,7 +39,7 @@
<catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
<category class="Magento\Catalog\Test\Fixture\Category" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductVisibleInCategory>
<assertProductNotVisibleInCategory module="Magento_Catalog">
@@ -48,7 +48,7 @@
<catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
<category class="Magento\Catalog\Test\Fixture\Category" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductNotVisibleInCategory>
<assertProductSearchableBySku module="Magento_Catalog">
@@ -56,7 +56,7 @@
<require>
<catalogSearchResult class="Magento\CatalogSearch\Test\Page\CatalogsearchResult" />
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductSearchableBySku>
<assertProductInCategory module="Magento_Catalog">
@@ -64,7 +64,7 @@
<require>
<catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
<category class="Magento\Catalog\Test\Fixture\Category" />
</require>
</assertProductInCategory>
@@ -72,7 +72,7 @@
<severity>low</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
<checkoutCart class="Magento\Checkout\Test\Page\CheckoutCart" />
</require>
</assertProductInCart>
@@ -80,42 +80,42 @@
<severity>middle</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductPage>
<assertProductGroupedPriceOnProductPage module="Magento_Catalog">
<severity>low</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductGroupedPriceOnProductPage>
<assertProductSpecialPriceOnProductPage module="Magento_Catalog">
<severity>low</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductSpecialPriceOnProductPage>
<assertProductTierPriceOnProductPage module="Magento_Catalog">
<severity>low</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductTierPriceOnProductPage>
<assertProductCustomOptionsOnProductPage module="Magento_Catalog">
<severity>low</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductCustomOptionsOnProductPage>
<assertProductForm module="Magento_Catalog">
<severity>low</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductForm>
<assertAddToCartButtonAbsent module="Magento_Catalog">
@@ -129,7 +129,7 @@
<require>
<catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
<category class="Magento\Catalog\Test\Fixture\Category" />
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
<catalogSearchResult class="Magento\CatalogSearch\Test\Page\CatalogsearchResult" />
@@ -139,14 +139,14 @@
<severity>low</severity>
<require>
<productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductSkuAutoGenerated>
<assertProductGroupedPriceOnProductPage module="Magento_Catalog">
<severity>low</severity>
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertProductGroupedPriceOnProductPage>
<assertProductAttributeSaveMessage module="Magento_Catalog">
@@ -171,7 +171,7 @@
<productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
<productSetEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit" />
<productSet class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex" />
- <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
+ <fixtureFactory class="Magento\Mtf\Fixture\FixtureFactory" />
</require>
</assertAddedProductAttributeOnProductForm>
<assertProductAttributeIsRequired module="Magento_Catalog">
@@ -289,7 +289,7 @@
<assertCategoryAbsenceOnFrontend module="Magento_Catalog">
<severity>low</severity>
<require>
- <browser class="Mtf\Client\Browser" />
+ <browser class="Magento\Mtf\Client\Browser" />
<categoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
<category class="Magento\Catalog\Test\Fixture\Category" />
</require>
@@ -326,7 +326,7 @@
<assertProductTemplateOnProductForm module="Magento_Catalog">
<severity>high</severity>
<require>
- <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
+ <fixtureFactory class="Magento\Mtf\Fixture\FixtureFactory" />
<attributeSet class="Magento\Catalog\Test\Fixture\CatalogAttributeSet" />
<productEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
<productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
@@ -394,7 +394,7 @@
<assertProductDuplicatedInGrid module="Magento_Catalog">
<severity>low</severity>
<require>
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
<productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
</require>
</assertProductDuplicatedInGrid>
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 34945296329..fadb2635416 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
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
<scenario name="CreateProductAttributeEntityFromProductPageTest" module="Magento_Catalog">
<methods>
<method name="test">
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 a2e53144ce8..e667956e1f8 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
@@ -6,8 +6,8 @@
namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Backend\Test\Block\Widget\Grid;
/**
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
index 913a5dfeb7b..ed6797e5656 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php
@@ -7,9 +7,9 @@
namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit;
use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class PromoForm
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
index e4f55722744..2ad3ea93baa 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -6,9 +6,9 @@
namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit\Tab;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Conditions
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
index 068d5094e46..a66e4e04959 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Conditions.php
@@ -5,8 +5,8 @@
*/
namespace Magento\CatalogRule\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Conditions
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 7de205897b2..7b5c27f818e 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
@@ -9,7 +9,7 @@ namespace Magento\CatalogRule\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCatalogPriceRuleAppliedCatalogPage
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 f5cf729f3b3..fb49621cc04 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
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCatalogPriceRuleAppliedProductPage
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 3ff64a39e77..e1a3b8bccf3 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
@@ -11,7 +11,7 @@ use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCatalogPriceRuleAppliedShoppingCart
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 1247ca4e175..5fc6a6d7bb7 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
@@ -9,7 +9,7 @@ namespace Magento\CatalogRule\Test\Constraint;
use Magento\CatalogRule\Test\Fixture\CatalogRule;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCatalogPriceRuleForm
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 bf157e0a4bc..88ffb1308f2 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
@@ -8,7 +8,7 @@ namespace Magento\CatalogRule\Test\Constraint;
use Magento\CatalogRule\Test\Fixture\CatalogRule;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCatalogPriceRuleInGrid
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 0a8c3522d38..c38cab63849 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
@@ -8,7 +8,7 @@ namespace Magento\CatalogRule\Test\Constraint;
use Magento\CatalogRule\Test\Fixture\CatalogRule;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCatalogPriceRuleNotInGrid
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 0c1e8c41d7e..8106e0062b1 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
@@ -7,7 +7,7 @@
namespace Magento\CatalogRule\Test\Constraint;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCatalogPriceRuleNoticeMessage
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 da703e0b1e6..30729236399 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
@@ -7,7 +7,7 @@
namespace Magento\CatalogRule\Test\Constraint;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCatalogPriceRuleSuccessDeleteMessage
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 46fa4556486..95e32ec3bd7 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
@@ -7,7 +7,7 @@
namespace Magento\CatalogRule\Test\Constraint;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCatalogPriceRuleSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogPriceRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogPriceRule.php
index d14ef23b1bf..ff33ac103f3 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogPriceRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogPriceRule.php
@@ -7,8 +7,8 @@
namespace Magento\CatalogRule\Test\Fixture;
use Magento\CatalogRule\Test\Repository\CatalogPriceRule as Repository;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
/**
* Class CatalogPriceRule
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php
index 910c5a91f0b..087f07330c5 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogRule\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class CatalogRule
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule/Conditions.php
index 714f7069486..548477e346f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule/Conditions.php
@@ -6,8 +6,8 @@
namespace Magento\CatalogRule\Test\Fixture\CatalogRule;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Conditions
@@ -23,7 +23,7 @@ class Conditions implements FixtureInterface
protected $data = [];
/**
- * @var \Mtf\Fixture\FixtureFactory
+ * @var \Magento\Mtf\Fixture\FixtureFactory
*/
protected $fixtureFactory;
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php
index 9b66a1bdd3b..10b7388a42a 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Conditions.php
@@ -8,8 +8,8 @@ namespace Magento\CatalogRule\Test\Fixture;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Fixture\CatalogProductSimple\CategoryIds;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Conditions
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Product/Category.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Product/Category.php
index c92ec7fe231..ed8f7755097 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Product/Category.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/Product/Category.php
@@ -6,8 +6,8 @@
namespace Magento\CatalogRule\Test\Fixture\Product;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Category
@@ -18,7 +18,7 @@ use Mtf\Fixture\FixtureInterface;
class Category implements FixtureInterface
{
/**
- * @var \Mtf\Fixture\FixtureFactory
+ * @var \Magento\Mtf\Fixture\FixtureFactory
*/
protected $fixtureFactory;
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/CatalogRuleInterface.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/CatalogRuleInterface.php
index 7e94d6c9874..5ea223b692b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/CatalogRuleInterface.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/CatalogRuleInterface.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CatalogRule\Test\Handler\CatalogRule;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CatalogRuleInterface
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php
index 8225dc55dcb..d1b01f2b89a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php
@@ -8,11 +8,11 @@ namespace Magento\CatalogRule\Test\Handler\CatalogRule;
use Magento\Backend\Test\Handler\Conditions;
use Magento\CatalogRule\Test\Handler\CatalogRule;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogPriceRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogPriceRule.php
index 3aad355402c..1a9b4268b9f 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogPriceRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogPriceRule.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogRule\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class CatalogPriceRule Repository
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
index a2d1254e13c..0fa29eb5721 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Repository/CatalogRule.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogRule\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class CatalogRule
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/AbstractCatalogRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/AbstractCatalogRuleEntityTest.php
index 83535be670a..5602c65632c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/AbstractCatalogRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/AbstractCatalogRuleEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Backend\Test\Page\Adminhtml\AdminCache;
use Magento\CatalogRule\Test\Fixture\CatalogRule;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Parent class for CatalogRule tests
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php
index 13fb5e1a6c3..959edfcf464 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/DeleteCatalogPriceRuleEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogRule\Test\TestCase;
use Magento\CatalogRule\Test\Fixture\CatalogRule;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Delete CatalogPriceRuleEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/DeleteAllCatalogRulesStep.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/DeleteAllCatalogRulesStep.php
index 9bffed37d4e..fd52826d9bc 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/DeleteAllCatalogRulesStep.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/DeleteAllCatalogRulesStep.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogRule\Test\TestStep;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class DeleteAllCatalogRulesStep
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
index 4503bbea042..c98608a6063 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Form.php
@@ -6,11 +6,11 @@
namespace Magento\CatalogSearch\Test\Block\Advanced;
-use Mtf\Block\Form as ParentForm;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form as ParentForm;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Advanced search form.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
index 79541bcf3d1..f62cc2ddfb1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Block/Advanced/Result.php
@@ -6,8 +6,8 @@
namespace Magento\CatalogSearch\Test\Block\Advanced;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Result
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 93246a5256e..3eb7492a8f7 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
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\CatalogSearch\Test\Page\AdvancedResult;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAdvancedSearchProductsResult
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 df52f62ce4f..410a7134bae 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
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\CatalogSearch\Test\Page\AdvancedResult;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Assert search results.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php
index 444b6ffba31..337398e208c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertProductCanBeOpenedFromSearchResult.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogSearch\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\CatalogSearch\Test\Page\AdvancedResult;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
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 2057dc418cc..1f1eeb86e3d 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
@@ -7,8 +7,8 @@
namespace Magento\CatalogSearch\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchSynonymMassActionNotOnFrontend
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 347b51322bb..63d60cf7c53 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
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchSynonymNotOnFrontend
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 bdde33a21d9..1a9dd4b4b7e 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
@@ -9,7 +9,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermForm
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 bb03c1a485b..9307dfff97a 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
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermInGrid
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 54cd1e2d301..9e6fc929963 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
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermMassActionNotOnFrontend
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 ba31e19ee04..4480b8795a9 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
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermMassActionsNotInGrid
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 986c39c669c..e1ddef02322 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
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermNotInGrid
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 0a331193d86..07016ce2297 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
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermNotOnFrontend
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 e696d2f7b9f..58e1aa3ab13 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
@@ -9,8 +9,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\Catalog\Test\Block\Search;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermOnFrontend
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 16ff4f13f1c..0177e5d8860 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
@@ -7,7 +7,7 @@
namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermSuccessDeleteMessage
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 c71093f642e..f05a61e2d0f 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
@@ -7,7 +7,7 @@
namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermSuccessMassDeleteMessage
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 8eb589cc133..96d9df392e9 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
@@ -7,7 +7,7 @@
namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermSuccessSaveMessage
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 05b1f68274f..01379f373a4 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
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermSynonymOnFrontend
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 ff6bc79e1a8..388806e1f3a 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
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\Constraint;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSuggestSearchingResult
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php
index ce372d1c8ad..82858efa74f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogSearch\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class CatalogSearchQuery
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
index 172d79054d9..b2bf945cc67 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery/QueryText.php
@@ -6,9 +6,9 @@
namespace Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Data to search for.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/CatalogSearchQueryInterface.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/CatalogSearchQueryInterface.php
index 431ad8860dd..cc6f02816f1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/CatalogSearchQueryInterface.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/CatalogSearchQueryInterface.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogSearch\Test\Handler\CatalogSearchQuery;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CatalogSearchQueryInterface
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/Curl.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/Curl.php
index ac1f7447596..d570d3653db 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\CatalogSearch\Test\Handler\CatalogSearchQuery;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Create new search term via curl.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php
index 789e3312ad1..60eea1265c7 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Repository/CatalogSearchQuery.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogSearch\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class CatalogSearchQuery
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php
index 98eaf67aad6..2bd73f161a8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\CatalogSearch\Test\TestCase;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\CatalogSearch\Test\Page\AdvancedSearch;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Preconditions:
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php
index 02dc9a6038c..106070b62ec 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogSearch\Test\TestCase;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateSearchTermEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php
index d9f55fe3744..b8400504d03 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogSearch\Test\TestCase;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteSearchTermEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php
index 4c6c542abae..a2b143d4786 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/EditSearchTermEntityTest.php
@@ -10,7 +10,7 @@ use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for EditSearchTermEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php
index 306ea03431d..4f35edd4150 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.php
@@ -8,8 +8,8 @@ namespace Magento\CatalogSearch\Test\TestCase;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for MassDeleteSearchTermEntity
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php
index a965f34e0fa..30a54eda01b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\TestCase;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Preconditions:
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php
index dda437f4e48..d4ce912e613 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogSearch\Test\TestCase;
use Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Cover Suggest Searching Result (SearchEntity)
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 7a061c80ad1..9a215cf30c0 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
@@ -48,7 +48,7 @@
<require>
<searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
- <browser class="Mtf\Client\Browser" />
+ <browser class="Magento\Mtf\Client\Browser" />
</require>
</assertSearchTermOnFrontend>
<assertSearchTermSuccessSaveMessage module="Magento_CatalogSearch">
@@ -62,7 +62,7 @@
<require>
<searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
- <browser class="Mtf\Client\Browser" />
+ <browser class="Magento\Mtf\Client\Browser" />
</require>
</assertSearchTermSynonymOnFrontend>
<assertSearchTermSuccessDeleteMessage module="Magento_CatalogSearch">
@@ -83,7 +83,7 @@
<require>
<searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
- <browser class="Mtf\Client\Browser" />
+ <browser class="Magento\Mtf\Client\Browser" />
</require>
</assertSearchTermNotOnFrontend>
<assertSearchSynonymNotOnFrontend module="Magento_CatalogSearch">
@@ -91,7 +91,7 @@
<require>
<searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
- <browser class="Mtf\Client\Browser" />
+ <browser class="Magento\Mtf\Client\Browser" />
</require>
</assertSearchSynonymNotOnFrontend>
<assertSearchTermSuccessMassDeleteMessage module="Magento_CatalogSearch">
@@ -110,14 +110,14 @@
<severity>high</severity>
<require>
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
- <browser class="Mtf\Client\Browser" />
+ <browser class="Magento\Mtf\Client\Browser" />
</require>
</assertSearchTermMassActionNotOnFrontend>
<assertSearchSynonymMassActionNotOnFrontend module="Magento_CatalogSearch">
<severity>high</severity>
<require>
<cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
- <browser class="Mtf\Client\Browser" />
+ <browser class="Magento\Mtf\Client\Browser" />
</require>
</assertSearchSynonymMassActionNotOnFrontend>
<assertProductCanBeOpenedFromSearchResult module="Magento_CatalogSearch">
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
index 78e78b920cf..2802929c106 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php
@@ -9,10 +9,10 @@ namespace Magento\Checkout\Test\Block;
use Exception;
use Magento\Checkout\Test\Block\Cart\CartItem;
use Magento\Checkout\Test\Block\Onepage\Link;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php
index 9bb23fb9ef1..c2c64fd6903 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php
@@ -6,7 +6,7 @@
namespace Magento\Checkout\Test\Block\Cart;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class AbstractCartItem
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
index 37279e168e8..0df5fe46b9e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartEmpty.php
@@ -6,8 +6,8 @@
namespace Magento\Checkout\Test\Block\Cart;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class CartEmpty
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 28eb3677d16..afd5015cfa5 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
@@ -6,7 +6,7 @@
namespace Magento\Checkout\Test\Block\Cart;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class CartItem
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
index 10cc6f978fe..58637651153 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php
@@ -6,8 +6,8 @@
namespace Magento\Checkout\Test\Block\Cart;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class DiscountCodes
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
index be5ac4d8680..b6fde4920b1 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
@@ -7,8 +7,8 @@
namespace Magento\Checkout\Test\Block\Cart;
use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class Shipping
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
index 8c9fcba5500..f909e97086b 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
@@ -6,9 +6,9 @@
namespace Magento\Checkout\Test\Block\Cart;
use Magento\Checkout\Test\Block\Cart\Sidebar\Item;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Sidebar
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 009dbf2080c..4805e9e8195 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
@@ -6,8 +6,8 @@
namespace Magento\Checkout\Test\Block\Cart;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Link.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Link.php
index db25444ba3b..cd1310aa639 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Link.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Link.php
@@ -6,7 +6,7 @@
namespace Magento\Checkout\Test\Block\Onepage;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Link
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 fcfbe4fa3cf..e45449de86f 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
@@ -7,8 +7,8 @@
namespace Magento\Checkout\Test\Constraint;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertAddedProductToCartSuccessMessage
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 c82dffd2d97..884ade85b09 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
@@ -8,8 +8,8 @@ namespace Magento\Checkout\Test\Constraint;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCartIsEmpty
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 1daf7be9ffe..c2dc2534f43 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
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Fixture\Cart\Items;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Assert that cart item options for product(s) display with correct information block.
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 cc6b3b6d8c0..ae6092c120f 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
@@ -8,7 +8,7 @@ namespace Magento\Checkout\Test\Constraint;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertGrandTotalInShoppingCart
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 cb4befc85d1..752aaf9c871 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
@@ -7,7 +7,7 @@
namespace Magento\Checkout\Test\Constraint;
use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderSuccessPlacedMessage
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 5639da766ad..aefa6c7410f 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
@@ -7,7 +7,7 @@
namespace Magento\Checkout\Test\Constraint;
use Magento\Checkout\Test\Page\CheckoutOnepage;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderTotalOnReviewPage
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 b010de8e5dc..3e45f83a879 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
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Fixture\Cart\Items;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertPriceInShoppingCart
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 64ee8bb3a26..db61bb67086 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
@@ -7,8 +7,8 @@
namespace Magento\Checkout\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductAbsentInMiniShoppingCart
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 cfce160ea59..b371ec3fc3a 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
@@ -7,7 +7,7 @@
namespace Magento\Checkout\Test\Constraint;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductIsNotEditable
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 75c3ce9bf03..4a64e5610c2 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
@@ -7,7 +7,7 @@
namespace Magento\Checkout\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductPresentInMiniShoppingCart
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 1fd9499bdba..f01fb902ebd 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
@@ -7,7 +7,7 @@
namespace Magento\Checkout\Test\Constraint;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductPresentInShoppingCart
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 23e4a1662f8..8a0dd741d18 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
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Fixture\Cart\Items;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductQtyInMiniShoppingCart
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 c104a7172da..b8c353c3f31 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
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Fixture\Cart\Items;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductQtyInShoppingCart
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 1486d72d50c..515b7433ede 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
@@ -7,7 +7,7 @@
namespace Magento\Checkout\Test\Constraint;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 81d8c95bef2..770595ed2bd 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
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Fixture\Cart\Items;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertSubtotalInShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php
index 4a2db34cc9c..aab39fa9e4e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.php
@@ -6,7 +6,7 @@
namespace Magento\Checkout\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php
index de23b4c2811..6ca6c12cc21 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php
@@ -6,8 +6,8 @@
namespace Magento\Checkout\Test\Fixture\Cart;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\ObjectManager;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\ObjectManager;
/**
* Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
index ea5315c2dce..8bfa4789d0e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
@@ -8,10 +8,10 @@ namespace Magento\Checkout\Test\TestCase;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for AddProductsToShoppingCartEntity
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
index fe869f8eb60..b3ae8fdbd93 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php
@@ -8,10 +8,10 @@ namespace Magento\Checkout\Test\TestCase;
use Magento\Checkout\Test\Page\CheckoutCart;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
/**
* Class DeleteProductFromMiniShoppingCartTest
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
index caa67406169..87b1cd59973 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php
@@ -8,11 +8,11 @@ namespace Magento\Checkout\Test\TestCase;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
/**
* Class DeleteProductsFromShoppingCartTest
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
index a4a01f195a5..f5d30d2f9bd 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.php
@@ -8,9 +8,9 @@ namespace Magento\Checkout\Test\TestCase;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
index 7f950968d95..bd3f7381fb4 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.php
@@ -10,9 +10,9 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Fixture\Cart;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Update ShoppingCart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
index a6e478ed087..bc314698d1f 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddProductsToTheCartStep.php
@@ -9,8 +9,8 @@ namespace Magento\Checkout\Test\TestStep;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class AddProductsToTheCartStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
index 40deeb5db84..1c0ce87c688 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
@@ -9,7 +9,7 @@ namespace Magento\Checkout\Test\TestStep;
use Magento\Checkout\Test\Page\CheckoutOnepage;
use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class FillBillingInformationStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingMethodStep.php
index 0d051665e6e..df510f1e2e8 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingMethodStep.php
@@ -7,7 +7,7 @@
namespace Magento\Checkout\Test\TestStep;
use Magento\Checkout\Test\Page\CheckoutOnepage;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class FillShippingMethodStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
index 3b72746e08c..7adfc7fc1ac 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
@@ -9,7 +9,7 @@ namespace Magento\Checkout\Test\TestStep;
use Magento\Checkout\Test\Constraint\AssertOrderTotalOnReviewPage;
use Magento\Checkout\Test\Page\CheckoutOnepage;
use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class PlaceOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ProceedToCheckoutStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ProceedToCheckoutStep.php
index 2776d137891..6fdee3ab317 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ProceedToCheckoutStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/ProceedToCheckoutStep.php
@@ -7,7 +7,7 @@
namespace Magento\Checkout\Test\TestStep;
use Magento\Checkout\Test\Page\CheckoutCart;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class ProceedToCheckoutStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
index 154ccf10810..3d37267a82e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
@@ -8,7 +8,7 @@ namespace Magento\Checkout\Test\TestStep;
use Magento\Checkout\Test\Page\CheckoutOnepage;
use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class SelectCheckoutMethodStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectPaymentMethodStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectPaymentMethodStep.php
index ba5eee6cc93..f17bc063c16 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectPaymentMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectPaymentMethodStep.php
@@ -7,7 +7,7 @@
namespace Magento\Checkout\Test\TestStep;
use Magento\Checkout\Test\Page\CheckoutOnepage;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class SelectPaymentMethodStep
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/scenario.xml
index ab0fe4da4e6..bef12be128c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
<scenario name="OnePageCheckoutTest" module="Magento_Checkout">
<methods>
<method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/CmsBlockInterface.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/CmsBlockInterface.php
index 128aee14baf..20685db1cde 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/CmsBlockInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/CmsBlockInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Cms\Test\Handler\CmsBlock;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CmsBlockInterface
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/Curl.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/Curl.php
index 2c716b8c993..49f62f95f85 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Cms\Test\Handler\CmsBlock;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/CmsPageInterface.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/CmsPageInterface.php
index 5c3ce1b3c17..35f8db75513 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/CmsPageInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/CmsPageInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Cms\Test\Handler\CmsPage;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CmsPageInterface
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php
index 012448057df..85e033bcf4a 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php
@@ -7,11 +7,11 @@
namespace Magento\Cms\Test\Handler\CmsPage;
use Magento\Backend\Test\Handler\Conditions;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
index 70bb2840162..1385164d592 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/AffectedAttributeSet.php
@@ -6,10 +6,10 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Backend\Test\Block\Widget\Form as ParentForm;
/**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
index fd89c189a2f..8470504b7f2 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,7 +7,7 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Composite;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Configure
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
index a449ffbd476..c402668ebfe 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
@@ -9,9 +9,9 @@ namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Supe
use Magento\Backend\Test\Block\Template;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Catalog\Test\Fixture\CatalogCategory;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
/**
* Class Config
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
index d187039b054..eecdf4f31dd 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
@@ -6,9 +6,9 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute\AttributeSelector;
/**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
index 960fe7a5a41..7fac9008118 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/AttributeSelector.php
@@ -6,7 +6,7 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute;
-use Mtf\Client\Element\SuggestElement;
+use Magento\Mtf\Client\Element\SuggestElement;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
/**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
index 8bb6c1eb331..fffb5b80c8e 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute/ToggleDropdown.php
@@ -6,8 +6,8 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
/**
* Class ToggleDropdown
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
index 2d7bf391fcb..11db5ed3046 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
@@ -6,10 +6,10 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
use Magento\Backend\Test\Block\Template;
use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Matrix
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
index 33906db2f02..b1822f54f0e 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/FormPageActions.php
@@ -6,8 +6,8 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class FormPageActions
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
index 868a284241a..7a666e37075 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/ProductForm.php
@@ -6,12 +6,12 @@
namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product;
-use Mtf\Client\Element;
-use Mtf\Fixture\DataFixture;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class ProductForm
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php
index 99d42204d7c..f7b417ba658 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Block\Product;
use Magento\ConfigurableProduct\Test\Block\Product\View\ConfigurableOptions;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class View
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
index fbe61c3b1c3..c191f139706 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View/ConfigurableOptions.php
@@ -9,11 +9,11 @@ namespace Magento\ConfigurableProduct\Test\Block\Product\View;
use Magento\Catalog\Test\Block\Product\View\CustomOptions;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class ConfigurableOptions
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 6ba16adff26..49ed7543a01 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
@@ -9,7 +9,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\CatalogSearch\Test\Page\CatalogsearchResult;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertChildProductIsNotDisplayedSeparately
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 3cb601b6485..80446fef978 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
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertChildProductsInGrid
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 73e39cb697c..22695040b34 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
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 443e8ab302c..e43779622b8 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
@@ -8,8 +8,8 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 7e8a9bce012..7bc07b5c990 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
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Assert form data equals duplicate product configurable data.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
index e0fd148d126..0cf25ed3ed8 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCart.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertConfigurableProductInCart
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCustomerWishlistOnBackendGrid.php
index d96b2f6eb8c..2b27a259c1e 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInCustomerWishlistOnBackendGrid.php
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
use Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertConfigurableProductInCustomerWishlistOnBackendGrid
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInItemsOrderedGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInItemsOrderedGrid.php
index 729f19f2a76..5b7a08c049a 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInItemsOrderedGrid.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductInItemsOrderedGrid.php
@@ -8,7 +8,7 @@ namespace Magento\ConfigurableProduct\Test\Constraint;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
use Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertConfigurableProductInItemsOrderedGrid
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 0b45b5dbed3..5a3965dca39 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
@@ -11,7 +11,7 @@ use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Conf
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductAttributeAbsenceInVariationsSearch
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 a8c49f6f177..402b06c7ab2 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
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config as TabVariation;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Assert check whether the attribute is used to create a configurable products.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php
index 29b62650fa4..80aa5bd293b 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
namespace Magento\ConfigurableProduct\Test\Fixture\Cart;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Item
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.php
index 1be0737898b..8dedc818972 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Fixture;
use Magento\Catalog\Test\Fixture\Product;
use Magento\Catalog\Test\Fixture\ProductAttribute;
use Magento\ConfigurableProduct\Test\Repository\ConfigurableProduct as Repository;
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
/**
* Class ConfigurableProduct
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php
index b2db8a8a3d8..99f2309d0d8 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable.php
@@ -6,12 +6,12 @@
namespace Magento\ConfigurableProduct\Test\Fixture;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
/**
* Configurable product fixture.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable/ConfigurableAttributesData.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable/ConfigurableAttributesData.php
index 4a9959eaec9..17e00b49ce7 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable/ConfigurableAttributesData.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProductInjectable/ConfigurableAttributesData.php
@@ -8,9 +8,9 @@ namespace Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class ConfigurableAttributesData
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/ConfigurableProductInjectableInterface.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/ConfigurableProductInjectableInterface.php
index df17a44e65f..ac4eed63d16 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/ConfigurableProductInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/ConfigurableProductInjectableInterface.php
@@ -6,7 +6,7 @@
namespace Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface ConfigurableProductInjectableInterface
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/Curl.php
index 9532613a342..2a354d1e6d4 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/ConfigurableProductInjectable/Curl.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\Handler\ConfigurableProductInjectable
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as ProductCurl;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable\ConfigurableAttributesData;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/Curl/CreateConfigurable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/Curl/CreateConfigurable.php
index 4f96c8c35f7..8b584d3b549 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/Curl/CreateConfigurable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/Curl/CreateConfigurable.php
@@ -8,12 +8,12 @@
namespace Magento\ConfigurableProduct\Test\Handler\Curl;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Create Configurable Product
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php
index 6de4962e991..aab0344ffb6 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProductInjectable.php
@@ -6,7 +6,7 @@
namespace Magento\ConfigurableProduct\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class ConfigurableProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
index 20dc365fb54..95a0ed331c1 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\ConfigurableProduct\Test\TestCase;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Coverage for CreateConfigurableProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableTest.php
index 971ca6fc17d..d2b92908b86 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableTest.php
@@ -7,8 +7,8 @@
namespace Magento\ConfigurableProduct\Test\TestCase;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class CreateConfigurableTest
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateWithAttributeTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateWithAttributeTest.php
index c273b8db9f6..6d3a0ebdd9d 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateWithAttributeTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateWithAttributeTest.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\TestCase;
use Magento\Catalog\Test\Fixture\Product;
use Magento\Catalog\Test\Fixture\ProductAttribute;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class CreateWithAttributeTest
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/EditConfigurableTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/EditConfigurableTest.php
index 3cf47fcf6e0..568fce2a32a 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/EditConfigurableTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/EditConfigurableTest.php
@@ -6,7 +6,7 @@
namespace Magento\ConfigurableProduct\Test\TestCase;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
/**
* Class EditConfigurableTest
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
index 707dca5ee81..e42c08cd992 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/UpdateConfigurableProductEntityTest.php
@@ -6,7 +6,7 @@
namespace Magento\ConfigurableProduct\Test\TestCase;
-use Mtf\TestCase\Scenario;
+use Magento\Mtf\TestCase\Scenario;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestStep/UpdateConfigurableProductStep.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestStep/UpdateConfigurableProductStep.php
index 46edf723603..d750752c960 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestStep/UpdateConfigurableProductStep.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestStep/UpdateConfigurableProductStep.php
@@ -9,8 +9,8 @@ namespace Magento\ConfigurableProduct\Test\TestStep;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProductInjectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Update configurable product step.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/scenario.xml
index 5736b9ae666..b53a78e864b 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
<scenario name="UpdateConfigurableProductEntityTest" module="Magento_ConfigurableProduct">
<methods>
<method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
index 7b7fc193e4b..719bbdc16f0 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Adminhtml/System/Variable/FormPageActions.php
@@ -7,7 +7,7 @@
namespace Magento\Core\Test\Block\Adminhtml\System\Variable;
use Magento\Backend\Test\Block\FormPageActions as AbstractFormPageActions;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class FormPageActions
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
index 0295051a8a4..c90426413c9 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Block/Messages.php
@@ -6,8 +6,8 @@
namespace Magento\Core\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Global messages block
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 b8fe842e075..331d1d31584 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
@@ -10,7 +10,7 @@ use Magento\Core\Test\Fixture\SystemVariable;
use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
use Magento\Core\Test\Page\Adminhtml\SystemVariableNew;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertCustomVariableForm
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 4a1ea3bf6f1..399d1cf6579 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
@@ -8,7 +8,7 @@ namespace Magento\Core\Test\Constraint;
use Magento\Core\Test\Fixture\SystemVariable;
use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomVariableInGrid
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 4ceeed0a49d..ea924d0c9bb 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
@@ -9,9 +9,9 @@ namespace Magento\Core\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Core\Test\Fixture\SystemVariable;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* Class AssertCustomVariableInPage
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 e3909d23062..ba47a15cbc3 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
@@ -8,7 +8,7 @@ namespace Magento\Core\Test\Constraint;
use Magento\Cms\Test\Page\Adminhtml\CmsNew;
use Magento\Core\Test\Fixture\SystemVariable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomVariableNotInCmsPageForm
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 ba1bf51c401..1f7b0a5f6e9 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
@@ -8,7 +8,7 @@ namespace Magento\Core\Test\Constraint;
use Magento\Core\Test\Fixture\SystemVariable;
use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomVariableNotInGrid
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 ea831007434..f25ff181eb1 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
@@ -7,7 +7,7 @@
namespace Magento\Core\Test\Constraint;
use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomVariableSuccessDeleteMessage
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 56ca2bf0661..a6107f10dd3 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
@@ -7,7 +7,7 @@
namespace Magento\Core\Test\Constraint;
use Magento\Core\Test\Page\Adminhtml\SystemVariableIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomVariableSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php
index ef5afdf6641..0dd119e2d36 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/ConfigData.php
@@ -6,7 +6,7 @@
namespace Magento\Core\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class ConfigData
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php
index 8671a384d5f..5dc92e19efb 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Fixture/SystemVariable.php
@@ -6,7 +6,7 @@
namespace Magento\Core\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class SystemVariable
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/ConfigDataInterface.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/ConfigDataInterface.php
index 46e280e3a7b..7189e812293 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/ConfigDataInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/ConfigDataInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Core\Test\Handler\ConfigData;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface ConfigDataInterface
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php
index 3f17403f0c0..f2168174fcc 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Core\Test\Handler\ConfigData;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/Curl.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/Curl.php
index 43eaa3b5902..696d8aca6f0 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Core\Test\Handler\SystemVariable;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/SystemVariableInterface.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/SystemVariableInterface.php
index 03b49763dd3..342213d9c61 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/SystemVariableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/SystemVariable/SystemVariableInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Core\Test\Handler\SystemVariable;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface SystemVariableInterface
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php
index 330590dcb95..4135d0431d5 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/SystemVariable.php
@@ -6,7 +6,7 @@
namespace Magento\Core\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class SystemVariable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
index 8c0bebfe2b5..36c96877890 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
@@ -7,8 +7,8 @@
namespace Magento\Customer\Test\Block\Account;
use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class AddressesAdditional
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
index 6a534d3675c..61b9e79d94d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php
@@ -6,8 +6,8 @@
*/
namespace Magento\Customer\Test\Block\Account;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Addresses default block
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Address.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Address.php
index d64bd7ec75b..d9210fe4c9d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Address.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Block\Account\Dashboard;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Address
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php
index 80775eacd60..752cf03df70 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Info.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Block\Account\Dashboard;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Info
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
index e9e9dc79c43..2f3745944d4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Links.php
@@ -6,8 +6,8 @@
namespace Magento\Customer\Test\Block\Account;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
index 0a0aacd1edb..d5278db123f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php
@@ -7,8 +7,8 @@
namespace Magento\Customer\Test\Block\Address;
use Magento\Customer\Test\Fixture\Address;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class Edit
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
index 0be09cdef87..cdf70642bbd 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
@@ -7,8 +7,8 @@
namespace Magento\Customer\Test\Block\Adminhtml\Edit;
use Magento\Backend\Test\Block\Widget\FormTabs;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class CustomerForm
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 d74ee4a9d5d..864fbb11f81 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
@@ -8,10 +8,10 @@ namespace Magento\Customer\Test\Block\Adminhtml\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Addresses
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 259a8e0d8e0..21b2410a615 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
@@ -6,9 +6,9 @@
namespace Magento\Customer\Test\Block\Form;
-use Mtf\Block\Form;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Fixture\FixtureInterface;
use Magento\Customer\Test\Fixture\CustomerInjectable;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
index 14ea91e4b61..b8a9dc7afbd 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/ForgotPassword.php
@@ -7,8 +7,8 @@
namespace Magento\Customer\Test\Block\Form;
use Magento\Customer\Test\Fixture\Customer;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
*/
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
index 1e6aeeab180..2b009be5719 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Login.php
@@ -6,9 +6,9 @@
namespace Magento\Customer\Test\Block\Form;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Login
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
index 6b7d906bafc..d5de5868dba 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/Register.php
@@ -6,9 +6,9 @@
namespace Magento\Customer\Test\Block\Form;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Register
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 ab8cdd7a09d..6259e116b41 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
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAddressDeletedBackend
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 59d7c65a957..c6cbb07fb13 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAddressDeletedFrontend
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 78d026849c1..8c27d596f97 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\CustomerAccountEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertChangePasswordFailMessage
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 1c20d0279f4..ab7ac43f795 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerAddressSuccessSaveMessage
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 e5797656006..3fb0c59976d 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
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerDefaultAddresses
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 c628151dc76..36fe9c355c1 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\CustomerAccountCreate;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerFailRegisterMessage
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 de31e2f323f..0c55f3cd04a 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
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerForm
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 16c8aae67ba..8307c220fe2 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerGroupAlreadyExists
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 f868758d3ec..6cc186ea9e5 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
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerGroupForm
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 6d51e076e38..1d938173f9e 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
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerGroupInGrid
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 93e5357f6f9..cabf657058a 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
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerGroupNotInGrid
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 784167e2aea..10d3c750d07 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
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* Class AssertCustomerGroupOnCustomerForm
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 469bb37c53f..311a8e0bafb 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerGroupSuccessDeleteMessage
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 4876b0d1bd3..6c32ceb281d 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerGroupSuccessSaveMessage
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 56c20f0a97e..569e949e917 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
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerInGrid
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 068def78da9..6f9d6d9c144 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerInfoSuccessSavedMessage
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 83cc134fe2a..63c178507c6 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
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerInvalidEmail
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 9e8c1e10099..f309e6ac9db 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
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerMassDeleteInGrid
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 163ffab9417..c2bbd18879b 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
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerMassDeleteNotInGrid
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 0ca26366253..77e7ada0042 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerMassDeleteSuccessMessage
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 42ed108c63b..69104a54536 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
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerNotInGrid
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 07ce3870907..67e2021c36e 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
@@ -8,8 +8,8 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* Check that login again to frontend with new password was success.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
index c77502129d6..80a41da9d27 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\CustomerAccountIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Check that after clicking to "Create account" button customer redirected to Dashboard.
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 4bc212dc9c1..c1880977187 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerSuccessDeleteMessage
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 4f3646e6d4a..3ad80d98d85 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\CustomerAccountCreate;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerSuccessRegisterMessage
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 c6939cb4d1a..198d824e705 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
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerSuccessSaveMessage
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 9ac88c66c54..cdd9c6c2cd2 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
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertMassActionSuccessUpdateMessage
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 3deee0d1f81..341c4befe32 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,7 +8,7 @@ namespace Magento\Customer\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Check that conformation message is present.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Address.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Address.php
index 4d141c5eb60..3419fc5b42e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Address.php
@@ -6,9 +6,9 @@
namespace Magento\Customer\Test\Fixture;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Address
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php
index f1e15852d1c..9ef1a4ea240 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php
@@ -9,10 +9,10 @@ namespace Magento\Customer\Test\Fixture;
/**
* Address of registered customer
*/
-class AddressBook extends \Mtf\Fixture\DataFixture
+class AddressBook extends \Magento\Mtf\Fixture\DataFixture
{
/**
- * @var \Mtf\Fixture\DataFixture
+ * @var \Magento\Mtf\Fixture\DataFixture
*/
protected $_addressFixture;
@@ -26,9 +26,9 @@ class AddressBook extends \Mtf\Fixture\DataFixture
/**
* Set address fixture
*
- * @param \Mtf\Fixture\DataFixture $address
+ * @param \Magento\Mtf\Fixture\DataFixture $address
*/
- public function setAddress(\Mtf\Fixture\DataFixture $address)
+ public function setAddress(\Magento\Mtf\Fixture\DataFixture $address)
{
$this->_addressFixture = $address;
}
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php
index c021f8acfa4..be272903dde 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressInjectable.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AddressInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer.php
index 01e4950e494..52bd27ee085 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer.php
@@ -6,8 +6,8 @@
namespace Magento\Customer\Test\Fixture;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
/**
* Class Customer
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerBackend.php
index 1d51c93d08a..274b3d8c81f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerBackend.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Fixture;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
/**
* Customer in Backend
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup.php
index 5b461b44136..f905b2dca67 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup.php
@@ -6,8 +6,8 @@
namespace Magento\Customer\Test\Fixture;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
/**
* Class Customer Group Fixture
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php
index 08b310d5c17..db297d43bb3 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroup/TaxClassIds.php
@@ -7,8 +7,8 @@
namespace Magento\Customer\Test\Fixture\CustomerGroup;
use Magento\Tax\Test\Fixture\TaxClass;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class TaxClassIds
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php
index 8367374caf1..067628370b1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerGroupInjectable.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class CustomerGroupInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php
index 6a662d177f2..aa935e1a85c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class CustomerInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/Address.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/Address.php
index e1157be1a9f..7a5d580c6b4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/Address.php
@@ -7,8 +7,8 @@
namespace Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Address
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/GroupId.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/GroupId.php
index 91b7c0bdb73..1c728b16ec4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/GroupId.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/CustomerInjectable/GroupId.php
@@ -7,8 +7,8 @@
namespace Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class GroupId
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomer.php
index b51d232c2e6..03e09cebf8e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomer.php
@@ -7,10 +7,10 @@
namespace Magento\Customer\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
/**
* Class CreateCustomer.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerBackend.php
index 8c9535e677a..f2ef96f3636 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerBackend.php
@@ -7,12 +7,12 @@
namespace Magento\Customer\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Curl handler for creating customer in admin
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerGroup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerGroup.php
index 02140bcc661..4c14cc43113 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/CreateCustomerGroup.php
@@ -6,12 +6,12 @@
namespace Magento\Customer\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Curl handler for creating customer group in admin
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/SaveCustomerWithAddress.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/SaveCustomerWithAddress.php
index 5e2662520ba..945abc71934 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/SaveCustomerWithAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Curl/SaveCustomerWithAddress.php
@@ -6,10 +6,10 @@
namespace Magento\Customer\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
/**
* Curl handler for saving customer address in admin
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php
index 83b7d6086ad..bcc05fc5209 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/Curl.php
@@ -7,12 +7,12 @@
namespace Magento\Customer\Test\Handler\CustomerGroupInjectable;
use Magento\Backend\Test\Handler\Extractor;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php
index a21630e2009..c9388a4daf9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroupInjectable/CustomerGroupInjectableInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Handler\CustomerGroupInjectable;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CustomerGroupInjectableInterface
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 c102f9aac7e..52b1c48dfbf 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
@@ -7,12 +7,12 @@
namespace Magento\Customer\Test\Handler\CustomerInjectable;
use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/CustomerInjectableInterface.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/CustomerInjectableInterface.php
index 9c0215484c9..a97cbe97367 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/CustomerInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/CustomerInjectableInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Handler\CustomerInjectable;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface CustomerInjectableInterface
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Ui/CreateAddress.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Ui/CreateAddress.php
index 24a066b4d3a..adc3d2d2731 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Ui/CreateAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Ui/CreateAddress.php
@@ -7,13 +7,13 @@
namespace Magento\Customer\Test\Handler\Ui;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* UI handler for creating customer address.
*/
-class CreateAddress extends \Mtf\Handler\Ui
+class CreateAddress extends \Magento\Mtf\Handler\Ui
{
/**
* Execute handler
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Webapi/CreateCustomer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Webapi/CreateCustomer.php
index 64444bdfa34..5d3e2251705 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Webapi/CreateCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Webapi/CreateCustomer.php
@@ -7,9 +7,9 @@
namespace Magento\Customer\Test\Handler\Webapi;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Webapi;
-use Mtf\Util\Protocol\SoapTransport;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Webapi;
+use Magento\Mtf\Util\Protocol\SoapTransport;
/**
* Class CreateCustomer
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
index 6f67a22bce3..54b9775dbec 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php
@@ -7,9 +7,9 @@
namespace Magento\Customer\Test\Page\Address;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
/**
* Class DefaultAddress
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
index 07ecc049911..ff129b94eb1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php
@@ -6,9 +6,9 @@
namespace Magento\Customer\Test\Page;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
/**
*/
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogout.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogout.php
index 0bf0bea1b74..9c34d17af3c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogout.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountLogout.php
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\Page;
-use Mtf\Page\Page;
+use Magento\Mtf\Page\Page;
/**
* Class CustomerAccountLogout
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
index c08ee05a0fa..91fbd97193b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php
@@ -7,9 +7,9 @@
namespace Magento\Customer\Test\Page;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
/**
* Customer Address Edit page.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.php
index 17560e76c41..6012db8cdd1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Address Repository
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php
index ea198cb5e26..e980970452a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressInjectable.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class AddressInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.php
index a65111b1185..c0d1a738940 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Customer Repository
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroup.php
index 08199c67c04..a54e62a838b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroup.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Customer Group Repository
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php
index 6b50700abd5..f9ef35f9a95 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroupInjectable.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class CustomerGroupInjectable
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 13fcff343ea..8154cf0f218 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
@@ -6,7 +6,7 @@
namespace Magento\Customer\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class CustomerInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php
index e3733a3423f..c979cd41c25 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/BackendCustomerCreateTest.php
@@ -6,8 +6,8 @@
namespace Magento\Customer\Test\TestCase;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
class BackendCustomerCreateTest extends Functional
{
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
index 617ee04eaf9..ec75d23b104 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Coverage for CreateCustomerBackendEntityTest
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
index 82d2fa120f6..8ba1a89d841 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateCustomerGroupEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
index 56253f8b97f..6ab2dd30c72 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
@@ -10,7 +10,7 @@ use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountCreate;
use Magento\Customer\Test\Page\CustomerAccountLogout;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateExistingCustomerFrontendEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
index 42ff1a7f39d..22d2be27760 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerAddressTest.php
@@ -10,7 +10,7 @@ use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountIndex;
use Magento\Customer\Test\Page\CustomerAccountLogin;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteCustomerAddress
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php
index f847ee0f4be..d6fe3981534 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerBackendEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test creation for DeleteCustomerBackendEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
index 1946240cdd9..dda7cbc0c85 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteCustomerGroupEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
index 9294155fe0b..b07f1dd1a03 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
@@ -6,8 +6,8 @@
namespace Magento\Customer\Test\TestCase;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Reset password on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php
index eee60e547ff..fa1782e8a4d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassAssignCustomerGroupTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test creation for MassAssignCustomerGroup
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php
index cb0213e5e54..99efcb8300d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/MassDeleteCustomerBackendEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\Customer\Test\TestCase;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test creation for MassDeleteCustomerBackendEntityTest
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
index 377641038f2..586084a5fa7 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountCreate;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Page\CustomerAccountLogout;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
index f3a9a814d18..ed3e94fc950 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateCustomerBackendEntity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
index e95db553f49..9c1822ed88b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest.php
@@ -14,8 +14,8 @@ use Magento\Customer\Test\Page\CustomerAccountEdit;
use Magento\Customer\Test\Page\CustomerAccountIndex;
use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAddressEdit;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
index ded609bad23..1b544914dce 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestCase;
use Magento\Customer\Test\Fixture\CustomerGroupInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Update Customer Group Entity
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php
index 75564372ab8..e3c28182eef 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateCustomerStep.php
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\TestStep;
use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class CreateCustomerStep
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php
index b226fbfbf71..21d3291f649 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\TestStep;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class CreateOrderFromCustomerAccountStep
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php
index 12902e16cf9..4cc77cfa414 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Test\TestStep;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountLogin;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Login customer on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
index b49ea09db7b..57fb8c5d952 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
@@ -7,7 +7,7 @@
namespace Magento\Customer\Test\TestStep;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class LogoutCustomerOnFrontendStep
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php
index d63e0ba60d9..5182c34ee7c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php
@@ -8,7 +8,7 @@ namespace Magento\Customer\Test\TestStep;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class OpenCustomerOnBackendStep
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/scenario.xml
index 1d0c77e04be..1ffe25557c9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
<scenario name="CreateOrderFromCustomerPageTest" module="Magento_Customer">
<methods>
<method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index 69fcd34d3a7..9bb1f70601c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -6,10 +6,10 @@
namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Downloadable
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinkRow.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinkRow.php
index aeae55fd0ec..3cdd191ec08 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinkRow.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinkRow.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class LinkRow
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 8b0e372cccd..cd799e849f6 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -5,9 +5,9 @@
*/
namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SampleRow.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SampleRow.php
index 6574b462fe2..32e504efe5a 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SampleRow.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SampleRow.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class SampleRow
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index d51106239e1..5678ebd679f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -5,9 +5,9 @@
*/
namespace Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class SampleRow
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.php
index ec98b6311bc..db10ef66ce1 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,7 +7,7 @@
namespace Magento\Downloadable\Test\Block\Adminhtml\Product\Composite;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Configure
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
index 32865198f72..c15b0acc3ee 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View.php
@@ -7,8 +7,8 @@
namespace Magento\Downloadable\Test\Block\Catalog\Product;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class View
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
index a3f1d093957..fdd0aee5c6c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php
@@ -6,8 +6,8 @@
namespace Magento\Downloadable\Test\Block\Catalog\Product\View;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
index c50daf9add2..2adfcbf4382 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\Block\Catalog\Product\View;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Samples
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
index c9efe872c45..ae55ff3b18f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Customer/Products/ListProducts.php
@@ -7,8 +7,8 @@
namespace Magento\Downloadable\Test\Block\Customer\Products;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class ListProducts
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 75093a3f6a1..4fc2eadf8a9 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
@@ -9,7 +9,7 @@ namespace Magento\Downloadable\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductDuplicateForm;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertDownloadableDuplicateForm
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 4a82a3f0be1..376b7af496f 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
@@ -8,8 +8,8 @@ namespace Magento\Downloadable\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertDownloadableLinksData
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductInCustomerWishlistOnBackendGrid.php
index 3b2d61a5554..e1be5aba24b 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableProductInCustomerWishlistOnBackendGrid.php
@@ -8,7 +8,7 @@ namespace Magento\Downloadable\Test\Constraint;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
use Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertDownloadableProductInCustomerWishlistOnBackendGrid
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 71a64c214d4..17c1132ce71 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
@@ -8,8 +8,8 @@ namespace Magento\Downloadable\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertDownloadableSamplesData
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/Cart/Item.php
index c33a55a4e2d..6962509496d 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
namespace Magento\Downloadable\Test\Fixture\Cart;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.php
index f4d38073111..96407f349a1 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\Fixture;
use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
/**
* Class DownloadableProduct
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksNotPurchasedSeparately.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksNotPurchasedSeparately.php
index c51edf7d793..cc71d919ab8 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksNotPurchasedSeparately.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksNotPurchasedSeparately.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Downloadable\Test\Fixture\DownloadableProduct;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
/**
* Class LinksNotPurchasedSeparately
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksPurchasedSeparately.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksPurchasedSeparately.php
index c9013f0375e..0151c23348f 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksPurchasedSeparately.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct/LinksPurchasedSeparately.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\Fixture\DownloadableProduct;
use Magento\Downloadable\Test\Fixture\DownloadableProduct;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Factory\Factory;
/**
* Class LinksPurchasedSeparately
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
index ae72fdb25a2..cc798b15469 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class DownloadableProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Links.php
index 54db055d0c8..89189d993b2 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Links.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Links
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Samples.php
index 31ace5f0429..e7e7a3a1bc8 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProductInjectable/Samples.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Samples
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php
index 36c4d0570d1..34466591d86 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php
@@ -5,12 +5,12 @@
*/
namespace Magento\Downloadable\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
class CreateDownloadable extends Curl
{
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php
index 2c34a5381e8..fc45d141f13 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/Curl.php
@@ -7,11 +7,11 @@
namespace Magento\Downloadable\Test\Handler\DownloadableProductInjectable;
use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as ProductCurl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/DownloadableProductInjectableInterface.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/DownloadableProductInjectableInterface.php
index af455199b7d..04c50ffa5be 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/DownloadableProductInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/DownloadableProductInjectable/DownloadableProductInjectableInterface.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Downloadable\Test\Handler\DownloadableProductInjectable;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface DownloadableProductInjectableInterface
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
index de7dda22fc1..422267066a6 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProductInjectable.php
@@ -6,7 +6,7 @@
namespace Magento\Downloadable\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class DownloadableProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php
index d32fc67d140..3d92e2ab47b 100755
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/Create/LinksPurchasedSeparatelyTest.php
@@ -7,8 +7,8 @@
namespace Magento\Downloadable\Test\TestCase\Create;
use Magento\Downloadable\Test\Fixture\DownloadableProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class LinksPurchasedSeparatelyTest
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
index 8f7fa66882f..5256ad90ced 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Create DownloadableProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
index e53607eecbc..cdc9b994600 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Update DownloadableProductEntity
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 61e5435814d..7c70250f22a 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
@@ -20,7 +20,7 @@
<require>
<productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
<productPage class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
- <product class="Mtf\Fixture\FixtureInterface" />
+ <product class="Magento\Mtf\Fixture\FixtureInterface" />
</require>
</assertDownloadableDuplicateForm>
<assertDownloadableProductInCustomerWishlistOnBackendGrid module="Magento_Downloadable">
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
index 7b10f6f4eb3..874fcf8b3aa 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Form.php
@@ -6,9 +6,9 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Block\Form as ParentForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form as ParentForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/GiftOptions.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/GiftOptions.php
index 18c8184ddcc..dc4cd183092 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/GiftOptions.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/GiftOptions.php
@@ -10,7 +10,7 @@ namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
* Class GiftOptions
* Backend GiftMessage for order form.
*/
-class GiftOptions extends \Mtf\Block\Form
+class GiftOptions extends \Magento\Mtf\Block\Form
{
//
}
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
index b6c6b6c1c39..8a607e2a365 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items.php
@@ -7,8 +7,8 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create;
use Magento\GiftMessage\Test\Block\Adminhtml\Order\Create\Items\ItemProduct;
-use Mtf\Client\Locator;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Items
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
index 2c37fb50893..3627d161b35 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
@@ -6,7 +6,7 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\Create\Items;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
/**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Form.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Form.php
index da81852927d..48ce7e6ad17 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Form.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Form.php
@@ -6,7 +6,7 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View;
-use Mtf\Block\Form as ParentForm;
+use Magento\Mtf\Block\Form as ParentForm;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/GiftOptions.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/GiftOptions.php
index f2343fe5361..79e0184c7d5 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/GiftOptions.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/GiftOptions.php
@@ -10,7 +10,7 @@ namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View;
* Class GiftOptions
* Backend GiftMessage for order from.
*/
-class GiftOptions extends \Mtf\Block\Form
+class GiftOptions extends \Magento\Mtf\Block\Form
{
//
}
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
index e56a5ec339f..f6df838ca03 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items.php
@@ -7,8 +7,8 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View;
use Magento\GiftMessage\Test\Block\Adminhtml\Order\View\Items\ItemProduct;
-use Mtf\Client\Locator;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Items
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
index 1f0b389d719..46440c49f3c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php
@@ -6,7 +6,7 @@
namespace Magento\GiftMessage\Test\Block\Adminhtml\Order\View\Items;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
/**
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
index 3a15dbbf8cf..0c41872447b 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php
@@ -7,8 +7,8 @@
namespace Magento\GiftMessage\Test\Block\Message;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class Inline
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php
index 704799a725d..2c1a696e692 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php
@@ -6,7 +6,7 @@
namespace Magento\GiftMessage\Test\Block\Message\Inline;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class GiftMessageForm
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
index 5856ce8df42..b3c29e22520 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php
@@ -6,8 +6,8 @@
namespace Magento\GiftMessage\Test\Block\Message\Order\Items;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Gift message block for order's items on order view page.
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 bd5d809d0af..fe543f8c3bd 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
@@ -9,7 +9,7 @@ namespace Magento\GiftMessage\Test\Constraint;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertGiftMessageInBackendOrder
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 9e4204a5e4e..9a2946618d8 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
@@ -11,7 +11,7 @@ use Magento\Customer\Test\Page\CustomerAccountLogout;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
use Magento\Sales\Test\Page\OrderHistory;
use Magento\Sales\Test\Page\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertGiftMessageInFrontendOrder
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 693e0fa8924..09c931ac7a3 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
@@ -11,7 +11,7 @@ use Magento\Customer\Test\Page\CustomerAccountLogout;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
use Magento\Sales\Test\Page\OrderHistory;
use Magento\Sales\Test\Page\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertGiftMessageInFrontendOrderItems
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php
index 6e65e3ae4fe..d5857c0b99c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php
@@ -6,7 +6,7 @@
namespace Magento\GiftMessage\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class GiftMessage
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage/Items.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage/Items.php
index bff6852923d..d53cc719374 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage/Items.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage/Items.php
@@ -6,8 +6,8 @@
namespace Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Items
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php
index 436fee4c6bc..c0aae33db52 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Repository/GiftMessage.php
@@ -6,7 +6,7 @@
namespace Magento\GiftMessage\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class GiftMessage
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php
index 793ac9f616e..18848d9e75d 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageBackendStep.php
@@ -8,7 +8,7 @@ namespace Magento\GiftMessage\Test\TestStep;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class AddGiftMessageBackendStep
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php
index 2e1cabbb654..190de05c9ee 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php
@@ -8,7 +8,7 @@ namespace Magento\GiftMessage\Test\TestStep;
use Magento\Checkout\Test\Page\CheckoutOnepage;
use Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class AddGiftMessageStep
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml
index 27b48d7e39f..71282278e78 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
<scenario name="CheckoutWithGiftMessagesTest" module="Magento_GiftMessage">
<methods>
<method name="test">
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 4f6ad63cd64..dcf5ad4f512 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
@@ -6,9 +6,9 @@
namespace Magento\GoogleShopping\Test\Block\Adminhtml\Types\Edit;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class GoogleShoppingForm
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 37ce5a91a8c..7177cd74856 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
@@ -9,8 +9,8 @@ namespace Magento\GoogleShopping\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
use Magento\GoogleShopping\Test\Page\Adminhtml\GoogleShoppingTypesIndex;
use Magento\GoogleShopping\Test\Page\Adminhtml\GoogleShoppingTypesNew;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* Class AssertProductAttributeAbsenceForAttributeMapping
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php
index dcfa2ffe5ff..88734fe6eb2 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute.php
@@ -6,7 +6,7 @@
namespace Magento\GoogleShopping\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class GoogleShoppingAttribute
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute/AttributeSetId.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute/AttributeSetId.php
index 2cb95ff70cc..cfaf1d46249 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute/AttributeSetId.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Fixture/GoogleShoppingAttribute/AttributeSetId.php
@@ -7,8 +7,8 @@
namespace Magento\GoogleShopping\Test\Fixture\GoogleShoppingAttribute;
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AttributeSetId
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php
index a7977ac9b2c..cbf687a0740 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Repository/GoogleShoppingAttribute.php
@@ -6,7 +6,7 @@
namespace Magento\GoogleShopping\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class GoogleShoppingAttribute
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Composite/Configure.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
index df8cf85c629..11da495acee 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Composite/Configure.php
@@ -7,7 +7,7 @@
namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Composite;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Configure
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
index 275601b0631..037331074bd 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
@@ -7,9 +7,9 @@
namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
/**
* Class AssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
index 7a9ea7cc85d..1151e76c032 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts.php
@@ -6,8 +6,8 @@
namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped\AssociatedProducts;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class ListAssociatedProducts
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
index 34dd3ac6333..f7a644f9d93 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/ListAssociatedProducts/Product.php
@@ -6,7 +6,7 @@
namespace Magento\GroupedProduct\Test\Block\Adminhtml\Product\Grouped\AssociatedProducts\ListAssociatedProducts;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class Product
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
index 710eb38c9e7..fd8184a473a 100755
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
@@ -7,7 +7,7 @@
namespace Magento\GroupedProduct\Test\Block\Catalog\Product;
use Magento\Catalog\Test\Block\Product\View as ParentView;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class View
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
index da2a7c39827..0cacb9adcf1 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View/Type/Grouped.php
@@ -9,10 +9,10 @@ namespace Magento\GroupedProduct\Test\Block\Catalog\Product\View\Type;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\GroupedProduct\Test\Fixture\GroupedProduct;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Grouped
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart.php
index 3a6e060af80..3826d9a341e 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Checkout/Cart.php
@@ -7,7 +7,7 @@
namespace Magento\GroupedProduct\Test\Block\Checkout;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Cart
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
index 12a4b0299f8..5627b7785a3 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertPriceOnGroupedProductPage.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Constraint\AssertPriceOnProductPageInterface;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Assert that displayed grouped price on product page equals passed from fixture.
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 718c845554c..d471c60f1ee 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
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\Client\BrowserInterface;
/**
* Class AssertGroupedPriceOnGroupedProductPage
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 974ba950e37..fe78ef841ca 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
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductForm;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertGroupedProductForm
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php
index 44be1c0072b..4128f39dede 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInCustomerWishlistOnBackendGrid.php
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
use Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertGroupedProductInCustomerWishlistOnBackendGrid
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 122ee4e04d1..c91d1af7add 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
@@ -8,7 +8,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Sales\Test\Block\Adminhtml\Order\Create\Items;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertGroupedProductInItemsOrderedGrid
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 b359d695dd0..0ec0c06eff5 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
@@ -8,8 +8,8 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertGroupedProductsDefaultQty
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 fbfa0a532bb..0fd5cdd5b92 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
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\Client\BrowserInterface;
/**
* Class AssertSpecialPriceOnGroupedProductPage
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 26fd4f5fac0..c640d5b6aa2 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
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\Constraint;
use Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\Client\BrowserInterface;
/**
* Class AssertTierPriceOnGroupedProductPage
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/Cart/Item.php
index 5b6988cfa0e..3e91ccb2578 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/Cart/Item.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/Cart/Item.php
@@ -7,7 +7,7 @@
namespace Magento\GroupedProduct\Test\Fixture\Cart;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Item
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.php
index e53b8efd410..1a9779e6044 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.php
@@ -7,8 +7,8 @@
namespace Magento\GroupedProduct\Test\Fixture;
use Magento\Catalog\Test\Fixture\Product;
-use Mtf\Factory\Factory;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\System\Config;
/**
* Class GroupedProduct
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php
index 8cdbacd0153..3f1d1d5f4dc 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable.php
@@ -6,12 +6,12 @@
namespace Magento\GroupedProduct\Test\Fixture;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
/**
* Class GroupedProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php
index 416c89c7287..4065bfa0221 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Associated.php
@@ -6,9 +6,9 @@
namespace Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Associated
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Price.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Price.php
index 017b60e5a8d..b6811384f49 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Price.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProductInjectable/Price.php
@@ -7,7 +7,7 @@
namespace Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
use Magento\Catalog\Test\Fixture\CatalogProductSimple\Price as ParentPrice;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Price
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/Curl.php
index fe470516ed1..1880721ab7e 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/Curl.php
@@ -7,7 +7,7 @@
namespace Magento\GroupedProduct\Test\Handler\GroupedProductInjectable;
use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as AbstractCurl;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/GroupedProductInjectableInterface.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/GroupedProductInjectableInterface.php
index a3fdc3388de..59a19e47ffd 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/GroupedProductInjectableInterface.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Handler/GroupedProductInjectable/GroupedProductInjectableInterface.php
@@ -6,7 +6,7 @@
namespace Magento\GroupedProduct\Test\Handler\GroupedProductInjectable;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface GroupedProductInjectableInterface
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php
index 4d70d99c53e..54f00cd5e1f 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Repository/GroupedProductInjectable.php
@@ -6,7 +6,7 @@
namespace Magento\GroupedProduct\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class GroupedProductInjectable
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php
index 7644612df2d..72203425740 100755
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\Category;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateGroupedProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedTest.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedTest.php
index 4acbf23ba51..0c59909268d 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedTest.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedTest.php
@@ -7,8 +7,8 @@
namespace Magento\GroupedProduct\Test\TestCase;
use Magento\GroupedProduct\Test\Fixture\GroupedProduct;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
/**
* Class CreateGroupedTest
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php
index 5628179fcbc..a437d49447b 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/UpdateGroupedProductEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\GroupedProduct\Test\TestCase;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
use Magento\GroupedProduct\Test\Fixture\GroupedProductInjectable;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Update GroupedProductEntity
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php
index 3a6c6f623ff..7073a781039 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Export/Edit/Form.php
@@ -6,7 +6,7 @@
namespace Magento\ImportExport\Test\Block\Adminhtml\Export\Edit;
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Block\Form as AbstractForm;
/**
* Class Form
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 2ad78d38fe5..db5002a3950 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
@@ -9,7 +9,7 @@ namespace Magento\ImportExport\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
use Magento\ImportExport\Test\Fixture\ImportExport;
use Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAbsenceProductAttributeForExport
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php
index c825aff87c6..e45bd649867 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Fixture/ImportExport.php
@@ -6,7 +6,7 @@
namespace Magento\ImportExport\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class ImportExport
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 d26fac6fda9..549d7d2b9b3 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
@@ -6,10 +6,10 @@
namespace Magento\Install\Test\Block;
-use Mtf\Block\Form;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Create Admin Account block.
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 79f8707e5e7..c6f992c5dfb 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
@@ -6,10 +6,10 @@
namespace Magento\Install\Test\Block;
-use Mtf\Block\Form;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Customize Your Store block.
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 9a936c1a192..e1efe0955d5 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
@@ -6,8 +6,8 @@
namespace Magento\Install\Test\Block;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Database form.
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 4cacd3fa33b..40ae967bfd5 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
@@ -6,8 +6,8 @@
namespace Magento\Install\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Install 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 03bee11834a..8f3ddadef7e 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
@@ -6,8 +6,8 @@
namespace Magento\Install\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Landing 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 1d0d7f93c4e..08f7f40dbff 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
@@ -6,8 +6,8 @@
namespace Magento\Install\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* License 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 d6c1a2f9abb..0e9a566b0d2 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
@@ -6,8 +6,8 @@
namespace Magento\Install\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Readiness 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 865917e1212..654dd1ffc8f 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Block;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Web configuration block.
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 31fdded30b0..1b19c8a0ade 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
@@ -7,7 +7,7 @@
namespace Magento\Install\Test\Constraint;
use Magento\Install\Test\Page\Install;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Check that agreement text present on Terms & Agreement page during install.
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 a7cea54acdc..01f6a6e8341 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
@@ -7,7 +7,7 @@
namespace Magento\Install\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Assert that selected currency symbol 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
index a18bfb1e9a9..45805d80ab3 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\Install\Test\Page\Install;
use Magento\Install\Test\Fixture\Install as InstallConfig;
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 99225403378..06a8eacf21b 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
@@ -7,7 +7,7 @@
namespace Magento\Install\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 f4ee1907018..3248e930e92 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
@@ -7,8 +7,8 @@
namespace Magento\Install\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
use Magento\Catalog\Test\Fixture\Category;
/**
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 6fda9aa601d..d42cc5a9fb5 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
@@ -6,8 +6,8 @@
namespace Magento\Install\Test\Constraint;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
use Magento\Customer\Test\Page\CustomerAccountLogin;
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 3a10bdc4cc1..9c8df14af25 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,7 +8,7 @@ namespace Magento\Install\Test\Constraint;
use Magento\User\Test\Fixture\User;
use Magento\Install\Test\Page\Install;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\Install\Test\Fixture\Install as InstallConfig;
/**
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 32d69a4f443..ef42ae9ac9f 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
@@ -7,7 +7,7 @@
namespace Magento\Install\Test\Constraint;
use Magento\Install\Test\Page\Install;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Check 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 fe297aeb0d9..6a436e82d54 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
@@ -6,7 +6,7 @@
namespace Magento\Install\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class 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 943943cf5e9..9231f84c679 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,9 +10,9 @@ 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\System\Config;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\System\Config;
use Magento\Install\Test\Constraint\AssertAgreementTextPresent;
use Magento\Install\Test\Constraint\AssertSuccessfulReadinessCheck;
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
index 5c141cf0e1d..734d91c4264 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid.php
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\Block\Adminhtml\Integration;
use Magento\Backend\Test\Block\Widget\Grid;
use Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid\ResourcesPopup;
use Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid\TokensPopup;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class IntegrationGrid
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
index e5a7bf047bc..c3ef042b1c1 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/DeleteDialog.php
@@ -6,8 +6,8 @@
namespace Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class DeleteDialog
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/ResourcesPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/ResourcesPopup.php
index d4b21f3362a..6720168dc4f 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/ResourcesPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/ResourcesPopup.php
@@ -6,7 +6,7 @@
namespace Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class ResourcesPopup
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/TokensPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/TokensPopup.php
index 43651e1d78b..2c7c33b1db8 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/TokensPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Block/Adminhtml/Integration/IntegrationGrid/TokensPopup.php
@@ -6,7 +6,7 @@
namespace Magento\Integration\Test\Block\Adminhtml\Integration\IntegrationGrid;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class TokensPopup
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 af2f9851261..d32789af9ba 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
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
use Magento\Integration\Test\Page\Adminhtml\IntegrationNew;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertIntegrationForm
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 b770b325e65..81c5c22bab0 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
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertIntegrationInGrid
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 78468647fd0..3b2705ee799 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
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertIntegrationNotInGrid
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 7613e5c9728..f301fc6c00f 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
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertIntegrationResourcesPopup
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 7bc79c61f2e..fa8edc4ae44 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
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertIntegrationSuccessActivationMessage
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 044e26d231e..6ee3320e396 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
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertIntegrationSuccessDeleteMessage
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 fc5543afdc2..7abfeb28dac 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
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertIntegrationSuccessReauthorizeMessage
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 bfbf57ef093..c143ae8f0f2 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
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertIntegrationSuccessSaveMessage
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 d3643f0a469..f0d6b850672 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
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
use Magento\Integration\Test\Page\Adminhtml\IntegrationNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertIntegrationTokensAfterReauthorize
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 2bc2fe80c51..79af964f4ec 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
@@ -7,7 +7,7 @@
namespace Magento\Integration\Test\Constraint;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertIntegrationTokensPopup
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php
index f914c3d507d..71a9b860f2f 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Fixture/Integration.php
@@ -6,7 +6,7 @@
namespace Magento\Integration\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Integration
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/Curl.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/Curl.php
index a96f9123ac2..0550185ae18 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Integration\Test\Handler\Integration;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/IntegrationInterface.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/IntegrationInterface.php
index f5abf4c7f2c..4bfdf4efe2d 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/IntegrationInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Handler/Integration/IntegrationInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Integration\Test\Handler\Integration;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface IntegrationInterface
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php
index af4e955fca7..78c01f185fc 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Repository/Integration.php
@@ -6,7 +6,7 @@
namespace Magento\Integration\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Integration Repository
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 43db84b40c5..caf67686a36 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
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\TestCase;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Activate Integration Entity
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php
index 31c234c3c04..2056ea6a9c7 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/CreateIntegrationEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\TestCase;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
use Magento\Integration\Test\Page\Adminhtml\IntegrationNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Create Integration Entity
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php
index efdef5324b6..d1cbf03eaec 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.php
@@ -8,7 +8,7 @@ namespace Magento\Integration\Test\TestCase;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Delete Integration Entity
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
index 36c1743dccd..8519bb70812 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php
@@ -8,8 +8,8 @@ namespace Magento\Integration\Test\TestCase;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Reauthorize tokens for the Integration Entity.
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php
index 6fd90e31c2c..987c3c68b52 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/UpdateIntegrationEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Integration\Test\TestCase;
use Magento\Integration\Test\Fixture\Integration;
use Magento\Integration\Test\Page\Adminhtml\IntegrationIndex;
use Magento\Integration\Test\Page\Adminhtml\IntegrationNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Update Integration Entity
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
index 3207f23c71f..972317cb5c7 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Grid.php
@@ -6,7 +6,7 @@
namespace Magento\Newsletter\Test\Block\Adminhtml\Template;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
index 495d107de26..3de754dffa9 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/Preview.php
@@ -6,8 +6,8 @@
namespace Magento\Newsletter\Test\Block\Adminhtml\Template;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Newsletter template preview.
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 a6fcb89baaf..7e41b346d1d 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
@@ -8,7 +8,7 @@ namespace Magento\Newsletter\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Newsletter\Test\Page\Adminhtml\SubscriberIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCustomerIsSubscribedToNewsletter
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 eee0651315b..fe8a56af636 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
@@ -9,7 +9,7 @@ namespace Magento\Newsletter\Test\Constraint;
use Magento\Newsletter\Test\Fixture\Template;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateEdit;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertNewsletterForm
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 182f10bc13c..b5d1a1c72b4 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
@@ -8,7 +8,7 @@ namespace Magento\Newsletter\Test\Constraint;
use Magento\Newsletter\Test\Fixture\Template;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertNewsletterInGrid
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 5258ef9ba3c..aa0946c684d 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
@@ -8,8 +8,8 @@ namespace Magento\Newsletter\Test\Constraint;
use Magento\Newsletter\Test\Fixture\Template;
use Magento\Newsletter\Test\Page\Adminhtml\TemplatePreview;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertNewsletterPreview
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 e1903f8ccc5..b9dbcdceb67 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
@@ -8,7 +8,7 @@ namespace Magento\Newsletter\Test\Constraint;
use Magento\Newsletter\Test\Fixture\Template;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateQueue;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertNewsletterQueue
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 21c32980f81..0a71b2cc8ae 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
@@ -7,7 +7,7 @@
namespace Magento\Newsletter\Test\Constraint;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertNewsletterSuccessCreateMessage
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php
index 44f92cc2b6f..da668a8e4a7 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Template.php
@@ -6,7 +6,7 @@
namespace Magento\Newsletter\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Template
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/Curl.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/Curl.php
index 759a6177fb2..0cb1f61c745 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Newsletter\Test\Handler\Template;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/TemplateInterface.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/TemplateInterface.php
index cc4848f0dbe..9b262839826 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/TemplateInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Handler/Template/TemplateInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Newsletter\Test\Handler\Template;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface TemplateInterface
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php
index 00f90b9ced3..83669e31b84 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Repository/Template.php
@@ -6,7 +6,7 @@
namespace Magento\Newsletter\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class UrlRewrite
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
index 7f761fb67ab..1bffdfc6e1a 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/ActionNewsletterTemplateEntityTest.php
@@ -8,7 +8,7 @@ namespace Magento\Newsletter\Test\TestCase;
use Magento\Newsletter\Test\Fixture\Template;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Action for Newsletter Template (Preview and Queue)
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php
index b2c733f77bc..81a7e1a9949 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/CreateNewsletterTemplateEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Newsletter\Test\TestCase;
use Magento\Newsletter\Test\Fixture\Template;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateNewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Create Newsletter Template
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php
index c6396641141..9442ee96d8e 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.php
@@ -9,7 +9,7 @@ namespace Magento\Newsletter\Test\TestCase;
use Magento\Newsletter\Test\Fixture\Template;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateEdit;
use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateNewsletterTemplate
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php
index 10965d8e330..90eebe23e89 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/AbstractFilter.php
@@ -6,8 +6,8 @@
namespace Magento\Reports\Test\Block\Adminhtml;
-use Mtf\Block\Form;
-use Mtf\ObjectManager;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\ObjectManager;
/**
* Abstract Class Filter
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
index 05310a8a653..0780cf35898 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/AccountsGrid.php
@@ -6,8 +6,8 @@
namespace Magento\Reports\Test\Block\Adminhtml\Customer;
-use Mtf\Client\Locator;
-use Mtf\ObjectManager;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\ObjectManager;
/**
* Class AccountsGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
index b28a8183017..3bf9e419499 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Totals/Grid.php
@@ -6,8 +6,8 @@
namespace Magento\Reports\Test\Block\Adminhtml\Customer\Totals;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
index bb69c6ffb4c..b36221e8fe0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Refresh/Statistics/Grid.php
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Refresh\Statistics;
use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
index 87fa4046f70..3eaae41b7e2 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Customer/Grid.php
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Block\Adminhtml\Review\Customer;
use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
index 85349a92d39..7c253b7b2f2 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Grid.php
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Review\Products;
use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
index 731907233dc..e8f44efdbaa 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Review/Products/Viewed/ProductGrid.php
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class ProductGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
index fd972d74391..e3a36a9553e 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Sales\Orders\Viewed;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class FilterGrid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
index 9ffd58b15b6..2186b442e74 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\Block\Adminhtml\Shopcart\Product;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class Grid
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 deecca39c43..82e4fe1f4b0 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
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AbstractAssertCustomerOrderReportResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php
index 16c1fbcf29d..df6e3fb9662 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertInvoiceReportResult.php
@@ -8,8 +8,8 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Reports\Test\Page\Adminhtml\SalesInvoiceReport;
use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\ObjectManager;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
/**
* Class AbstractAssertInvoiceReportResult
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php
index 55fa321d281..16af632c450 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php
@@ -7,8 +7,8 @@
namespace Magento\Reports\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Page\BackendPage;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Page\BackendPage;
/**
* Class AbstractAssertSalesReportResult
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 7c38e4dfaa3..346f78a1c74 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
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Reports\Test\Page\Adminhtml\AbandonedCarts;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAbandonedCartCustomerInfoResult
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 726d18a3aad..350a81904f4 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
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Reports\Test\Page\Adminhtml\Bestsellers;
use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 685624924c9..da229325e70 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
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Reports\Test\Page\Adminhtml\SalesCouponReportView;
use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCouponReportResult
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 97f486de8c0..c77ecc0cfb6 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
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Reports\Test\Page\Adminhtml\DownloadsReport;
use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertDownloadsReportResult
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 8b1b7e8a777..bbdee1a27da 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
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Reports\Test\Page\Adminhtml\ProductLowStock;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertLowStockProductInGrid
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 8baf8d23c27..c3c05154509 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
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\Constraint;
use Magento\Reports\Test\Page\Adminhtml\CustomerAccounts;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertNewAccountsReportTotalResult
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 1cb398a2d6d..dc72afc3bd7 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
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Reports\Test\Page\Adminhtml\OrderedProductsReport;
use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderedProductResult
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 37a3af3ddaf..5bf977eb479 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
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Reports\Test\Page\Adminhtml\ShopCartProductReport;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductInCartResult
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 53f509fd465..d537838adef 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
@@ -12,7 +12,7 @@ use Magento\Reports\Test\Page\Adminhtml\CustomerReportReview;
use Magento\Review\Test\Constraint\AssertProductReviewInGrid;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReportByCustomerInGrid
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 0a3d13e4d0a..76116fee9c8 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
@@ -12,7 +12,7 @@ use Magento\Reports\Test\Page\Adminhtml\CustomerReportReview;
use Magento\Review\Test\Constraint\AssertProductReviewNotInGrid;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReportByCustomerNotInGrid
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 20e1610df69..f3ce68ad8d1 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
@@ -10,7 +10,7 @@ use Magento\Reports\Test\Page\Adminhtml\ProductReportReview;
use Magento\Review\Test\Constraint\AssertProductReviewInGrid;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReviewIsVisibleInGrid
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 61b45d29f0d..0d4604ec440 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
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Reports\Test\Page\Adminhtml\ProductReportReview;
use Magento\Review\Test\Fixture\Review;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReviewReportIsVisibleInGrid
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 d0d9400cf79..1ae6670b974 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
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Reports\Test\Page\Adminhtml\CustomerReportReview;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReviewsQtyByCustomer
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 0afd5c6c600..152cd5aa4ee 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
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\Constraint;
use Magento\Reports\Test\Page\Adminhtml\ProductReportView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductViewsReportTotalResult
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 004c3ad4f58..d1e75cff6ac 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
@@ -8,7 +8,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchEdit;
use Magento\Reports\Test\Page\Adminhtml\SearchIndex;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertSearchTermReportForm
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 ac622368eda..cbb20b5cb97 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
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\Constraint;
use Magento\Reports\Test\Page\Adminhtml\SearchIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSearchTermsInGrid
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 2443521f269..bf5d8478e6a 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
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Reports\Test\Page\Adminhtml\SalesTaxReport;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxReportInGrid
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 2e429dc13cd..b7090947f14 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
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\Constraint;
use Magento\Reports\Test\Page\Adminhtml\SalesTaxReport;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxReportNotInGrid
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 5a66fc06baf..bc27cf23ec8 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
@@ -6,9 +6,9 @@
namespace Magento\Reports\Test\TestCase;
-use Mtf\TestCase\Injectable;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
index 2bb0dafc671..28a4f7204b4 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/CustomerReviewReportEntityTest.php
@@ -15,9 +15,9 @@ use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAccountLogout;
use Magento\Reports\Test\Page\Adminhtml\ProductReportReview;
use Magento\Review\Test\Fixture\Review;
-use Mtf\Client\BrowserInterface;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CustomerReviewReportEntity
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php
index 557482ee225..a81da13dd13 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/LowStockProductsReportEntityTest.php
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\TestCase;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for LowStockProductsReportEntityTest
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php
index 5a75c804d4b..62a4231bca0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NewAccountsReportEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Reports\Test\TestCase;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
use Magento\Reports\Test\Page\Adminhtml\CustomerAccounts;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.php
index a26acb68c4e..92b8ee33316 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductReviewReportEntityTest.php
@@ -7,7 +7,7 @@
namespace Magento\Reports\Test\TestCase;
use Magento\Review\Test\Fixture\Review;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for ProductReviewReportEntity
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
index 30fc809072d..59fcbb7b335 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ProductsInCartReportEntity.php
@@ -12,8 +12,8 @@ use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAccountLogout;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for ProductsInCartReportEntity
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php
index b670f8024b2..eba901312b7 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SearchTermsReportEntityTest.php
@@ -8,8 +8,8 @@ namespace Magento\Reports\Test\TestCase;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Reports\Test\Page\Adminhtml\SearchIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
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 ca0670a0a06..7ed40fc54cd 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
@@ -6,9 +6,9 @@
namespace Magento\Reports\Test\TestCase;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
use Magento\Reports\Test\Page\Adminhtml\ProductReportView;
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
index 91b7aa7b0a3..4d51eea65d2 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/RatingElement.php
@@ -6,8 +6,8 @@
namespace Magento\Review\Test\Block\Adminhtml\Edit;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class RatingElement
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
index 5773e897d7d..76f821b010e 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Block\Adminhtml;
use Magento\Backend\Test\Block\Widget\Form;
use Magento\Review\Test\Fixture\ReviewInjectable;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class Edit
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
index 3e4188baa6c..449bc91419b 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Form.php
@@ -6,12 +6,12 @@
namespace Magento\Review\Test\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Review\Test\Fixture\Rating;
use Magento\Review\Test\Fixture\Review;
-use Mtf\Block\Form as AbstractForm;
+use Magento\Mtf\Block\Form as AbstractForm;
/**
* Review form on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View.php
index 802a9be4592..ca08c912dec 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View.php
@@ -7,7 +7,7 @@
namespace Magento\Review\Test\Block\Product;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class View
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
index 3874ae7a843..c193a6af97a 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Product/View/Summary.php
@@ -7,8 +7,8 @@
namespace Magento\Review\Test\Block\Product\View;
-use Mtf\Block\Block;
-use Mtf\Client\ElementInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\ElementInterface;
/**
* Reviews frontend block.
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 9f0d60cf1a0..ffc1ab0c766 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
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Fixture\Rating;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductRatingInGrid
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 054bf4de673..2f1ab78b298 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
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Review\Test\Fixture\Rating;
use Magento\Review\Test\Fixture\Review;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductRatingInProductPage
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 db3fdb0c528..9ec15f8d144 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
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Fixture\Rating;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductRatingNotInGrid
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 dff6d03fc53..11a01165df1 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
@@ -9,8 +9,8 @@ namespace Magento\Review\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Review\Test\Fixture\Rating;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductRatingNotInProductPage
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 0c256884589..a5db756a503 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
@@ -9,7 +9,7 @@ namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertProductRatingOnReviewPage
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 95da16862d9..4c9e6e5aab2 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
@@ -7,7 +7,7 @@
namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductRatingSuccessDeleteMessage
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 6168f31cbe8..36987feabff 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
@@ -7,7 +7,7 @@
namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductRatingSuccessSaveMessage
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 8d1752909c0..a7f527e20dd 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
@@ -7,7 +7,7 @@
namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReviewBackendSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php
index 2b8ce7fe0fe..eb6cb92c40c 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewForm.php
@@ -6,7 +6,7 @@
namespace Magento\Review\Test\Constraint;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
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 90485e15850..355bcd41fae 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
@@ -8,8 +8,8 @@ namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductReviewInGrid
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 07071d97637..1208bd72e4d 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
@@ -11,7 +11,7 @@ use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
use Magento\Review\Test\Block\Adminhtml\Product\Grid as ReviewsGrid;
use Magento\Review\Test\Fixture\Review;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReviewInGridOnCustomerPage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php
index 14eddfbb268..b4852e19d6e 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewIsAbsentOnProductPage.php
@@ -6,7 +6,7 @@
namespace Magento\Review\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
/**
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 a20ebe47231..cf57f87ba42 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
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReviewMassActionSuccessDeleteMessage
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 67d9c66a3ed..3f8d9c4c43c 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
@@ -8,7 +8,7 @@ namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReviewMassActionSuccessMessage
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 70f0a5fa4a2..6776c3a651d 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
@@ -8,8 +8,8 @@ namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductReviewNotInGrid
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 f856cb08aa1..4146c9519cc 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
@@ -9,8 +9,8 @@ namespace Magento\Review\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Review\Test\Fixture\Review;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertProductReviewNotOnProductPage
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 463a239dcea..2e15e514566 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
@@ -9,9 +9,9 @@ namespace Magento\Review\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\AdminCache;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Review\Test\Fixture\Review;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* 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 d421c2af7af..7ecf84f3dc1 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
@@ -7,7 +7,7 @@
namespace Magento\Review\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertReviewCreationSuccessMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php
index 6feba8a2740..e2aa568ff99 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewLinksIsPresentOnProductPage.php
@@ -6,10 +6,10 @@
namespace Magento\Review\Test\Constraint;
-use Mtf\Client\Browser;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\Browser;
+use Magento\Mtf\Fixture\InjectableFixture;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Assert that add and view review links are present on product page.
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 947790e85ec..3c41e413e45 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
@@ -7,7 +7,7 @@
namespace Magento\Review\Test\Constraint;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertReviewSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php
index e30f7358209..1e627941bd7 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertSetApprovedProductReview.php
@@ -6,7 +6,7 @@
namespace Magento\Review\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
use Magento\Backend\Test\Page\Adminhtml\AdminCache;
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php
index efa7bb2458a..6991179a370 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Rating.php
@@ -6,7 +6,7 @@
namespace Magento\Review\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Rating
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php
index 84226b39f9d..9c7c3175936 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review.php
@@ -6,7 +6,7 @@
namespace Magento\Review\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Product review fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/EntityId.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/EntityId.php
index 9cc4e25754d..6dd94f98ea9 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/EntityId.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/EntityId.php
@@ -6,9 +6,9 @@
namespace Magento\Review\Test\Fixture\Review;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class EntityId
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/Ratings.php b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/Ratings.php
index 473bcb90ad3..c19487164c8 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/Ratings.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Fixture/Review/Ratings.php
@@ -6,8 +6,8 @@
namespace Magento\Review\Test\Fixture\Review;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
use Magento\Review\Test\Fixture\Rating;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/Curl.php b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/Curl.php
index d5f15eee9ff..8d81761803b 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/Curl.php
@@ -7,12 +7,12 @@
namespace Magento\Review\Test\Handler\Rating;
use Magento\Backend\Test\Handler\Extractor;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/RatingInterface.php b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/RatingInterface.php
index 68b0397aaeb..b39248c7a5c 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/RatingInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Rating/RatingInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Review\Test\Handler\Rating;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface RatingInterface
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/Curl.php b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/Curl.php
index 39825844350..c99cac15199 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/Curl.php
@@ -6,15 +6,15 @@
namespace Magento\Review\Test\Handler\Review;
-use Mtf\System\Config;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
use Magento\Review\Test\Fixture\Rating;
use Magento\Backend\Test\Handler\Extractor;
use Magento\Review\Test\Fixture\Review;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
-use Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/ReviewInterface.php b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/ReviewInterface.php
index 7b5d19a5990..e8fadacfe34 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/ReviewInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Handler/Review/ReviewInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Review\Test\Handler\Review;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface ReviewInterface
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php
index e3422aa73d4..218bf96d0fb 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Rating.php
@@ -6,7 +6,7 @@
namespace Magento\Review\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Rating
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.php b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.php
index bd4fc2a8bbd..537245718b6 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Repository/Review.php
@@ -6,7 +6,7 @@
namespace Magento\Review\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Review
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php
index d3e7a3cefca..aff4c995ddb 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductRatingEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Review\Test\Fixture\Rating;
use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
use Magento\Review\Test\Page\Adminhtml\RatingNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Create Backend Product Rating
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
index 81c648ac66c..d2042d8a837 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewBackendEntityTest.php
@@ -12,7 +12,7 @@ use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Create ProductReviewEntity Backend
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
index 2a9e3b10c32..4345551308d 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest.php
@@ -11,8 +11,8 @@ use Magento\Review\Test\Constraint\AssertProductReviewIsAbsentOnProductPage;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php
index 9a7495de291..129b383ffe2 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/DeleteProductRatingEntityTest.php
@@ -8,8 +8,8 @@ namespace Magento\Review\Test\TestCase;
use Magento\Review\Test\Fixture\Rating;
use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteProductRatingEntity
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
index 3b6c394227a..52f5bbe692b 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ManageProductReviewFromCustomerPageTest.php
@@ -17,8 +17,8 @@ use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for ManageProductReviewFromCustomerPage
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php
index b0e43e961e4..9152f68dcf0 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/MassActionsProductReviewEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test creation for MassActions ProductReviewEntity
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php
index 58a3a59ff25..a37ab005cfe 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/ModerateProductReviewEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Review\Test\TestCase;
use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Moderate ProductReview Entity
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php
index f92480f74c7..08f69793f6f 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityOnProductPageTest.php
@@ -13,8 +13,8 @@ use Magento\Review\Test\Fixture\Review;
use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateProductReviewEntity on product page
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php
index a204a9db016..9d422a2a49a 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/UpdateProductReviewEntityTest.php
@@ -11,7 +11,7 @@ use Magento\Review\Test\Page\Adminhtml\RatingEdit;
use Magento\Review\Test\Page\Adminhtml\RatingIndex;
use Magento\Review\Test\Page\Adminhtml\ReviewEdit;
use Magento\Review\Test\Page\Adminhtml\ReviewIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Update Frontend Product Review
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 7038e02eb5d..5e703ad9afd 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
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
index 9c0993bfbe1..0c1435a6609 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class Product
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
index 93fbf1cda2d..88af288c29c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class AbstractItems
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItemsNewBlock.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItemsNewBlock.php
index dfa7aecce9a..907992a7e2c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItemsNewBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItemsNewBlock.php
@@ -7,8 +7,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
use Magento\Sales\Test\Block\Adminhtml\Order\AbstractForm\Product;
-use Mtf\Block\Block;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AbstractItemsNewBlock
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
index 3465ec7e6ca..4d5bf937f8f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Actions
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
index dceab16c969..cfeedc7b326 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -6,10 +6,10 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Create
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
index 85c6027cc62..2b5688f592c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class BillingAddress
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
index da0f65be72e..6397d53754a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Billing/Method.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Billing;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Method
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Customer.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Customer.php
index f077e90672c..ba5f99b4e70 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Customer.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Customer.php
@@ -8,7 +8,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Customer
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
index 1d6a9157f90..d475f5d0e97 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities.php
@@ -12,8 +12,8 @@ use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\R
use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\RecentlyViewedItems;
use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\RecentlyViewedProducts;
use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar\ShoppingCartItems;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class CustomerActivities
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
index 59020e2f277..f9c089f1a25 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Sidebar block.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
index 2acc032e58c..81c03a86225 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar/RecentlyViewedProducts.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar;
use Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities\Sidebar;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class RecentlyViewedProducts
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
index 1fbc751f9d3..7d2aec9dd17 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items.php
@@ -7,8 +7,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
use Magento\Backend\Test\Block\Template;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
index 9b5037f67a7..03ec6f8187c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Items/ItemProduct.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Items;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class ItemProduct
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
index 1c96edbe76e..73e951594ff 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -7,8 +7,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class ShippingAddress
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
index cf99504145f..4f9877eeca5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create\Shipping;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Method
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
index 26676720186..f48f0cbd9e3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Store.php
@@ -8,9 +8,9 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
use Magento\Store\Test\Fixture\Store as StoreFixture;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
/**
* Class Store
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php
index fe25005b4c4..39adad4c9f1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Create;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
index a740f6dcc21..38bbc88695c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Grid.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
index 9ded1b6918e..17d1dd67238 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/History.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
index 073a019ea8c..ed9f86ca74f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Form/Items.php
@@ -8,8 +8,8 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form;
use Magento\Sales\Test\Block\Adminhtml\Order\AbstractItemsNewBlock;
use Magento\Sales\Test\Block\Adminhtml\Order\Invoice\Form\Items\Product;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Grid.php
index 218fa8ee641..8b43fc9c27b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Grid.php
@@ -60,7 +60,7 @@ class Grid extends GridInterface
}
/**
- * @return mixed|\Mtf\Client\Element
+ * @return mixed|\Magento\Mtf\Client\Element
*/
private function getInvoiceAmountElement()
{
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
index 59ba8ff2333..09306ef33f7 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Invoice/Totals.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Invoice;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/Totals.php
index 802c0fd06e6..b2ae1df8954 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/Totals.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Shipment;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Status/Assign/AssignForm.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Status/Assign/AssignForm.php
index abd4fe06e23..aa776f8bb30 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Status/Assign/AssignForm.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Status/Assign/AssignForm.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\Status\Assign;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class AssignForm
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
index 7e1a293ba76..32f230e485f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Totals.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Totals
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
index dde14fefa34..cf49d099f2a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\View;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Block for information about customer on order page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
index 4eec62d00bf..58c36127d4c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php
@@ -8,8 +8,8 @@ namespace Magento\Sales\Test\Block\Adminhtml\Order\View;
use Magento\Catalog\Test\Fixture\Product;
use Magento\ConfigurableProduct\Test\Fixture\ConfigurableProduct;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
index 1c43e826c8f..aac809e587d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order\View\Tab;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Info
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
index 1808ad03c64..b93056743ec 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/History.php
@@ -6,9 +6,9 @@
namespace Magento\Sales\Test\Block\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class History
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
index 84e7b1ada31..9b7fc959836 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Info block on order's view page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
index 362696afc04..d044f994ac5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Items.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Items block on order's view page
@@ -31,7 +31,7 @@ class Items extends Block
/**
* Check if item is visible in print order page.
*
- * @param \Mtf\Fixture\InjectableFixture $product
+ * @param \Magento\Mtf\Fixture\InjectableFixture $product
* @return bool
*/
public function isItemVisible($product)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
index 41b73a9a29e..7f022785d59 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class View
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
index 8211997f28a..4c5756fecff 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
@@ -6,8 +6,8 @@
namespace Magento\Sales\Test\Block\Order\View;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Order view block.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertItems.php
index e40173a7ed1..041e7d7d586 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertItems.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Sales\Test\Fixture\OrderInjectable;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AbstractAssertArchiveItems
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertOrderOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertOrderOnFrontend.php
index cd09e9e27e1..3ebe97e8f48 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertOrderOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AbstractAssertOrderOnFrontend.php
@@ -9,8 +9,8 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Customer\Test\Page\CustomerAccountIndex;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\CustomerInjectable;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\ObjectManager;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
/**
* Abstract Class AbstractAssertOrderOnFrontend
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 73cd390792a..16edae04654 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
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertCreditMemoButton
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 6232e4c3698..8c5e6da9076 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
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\InvoiceIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertInvoiceInInvoicesGrid
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 9aa105083f3..bee91127373 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
@@ -10,7 +10,7 @@ use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Invoices\Grid;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertInvoiceInInvoicesTab
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 ab9529606e3..9faaaece512 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertInvoiceSuccessCreateMessage
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 dee20ee6e3f..15582ebab75 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertInvoiceWithShipmentSuccessMessage
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 1830982dc35..27168972b06 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
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertNoCreditMemoButton
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 faf9c3848f7..448ec5ef796 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
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertNoInvoiceButton
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 f4fea87c5ea..4e28fce3ab6 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\SalesOrder;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderButtonsAvailable
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 2642586da0b..1a2171ee10c 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
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderButtonsUnavailable
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 c466e7bb75c..890c0724d7d 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderCancelMassActionFailMessage
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 3471a9bc349..2714f10fbb2 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderCancelMassActionSuccessMessage
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 b8859fad542..5c164d1aee7 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderCancelSuccessMessage
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 002ae82bde4..317e93fbb00 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderGrandTotal
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 a02eacd05f2..691173f3cc2 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
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderInOrdersGrid
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 be39a398072..8b4dd2454da 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
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountIndex;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\OrderHistory;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\ObjectManager;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
/**
* Class AssertOrderInOrdersGridOnFrontend
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 57cf7ce184f..1f1508c0c42 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderMassOnHoldSuccessMessage
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 7960d579a4f..c89d729ef6e 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
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderNotInOrdersGrid
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 3ea3556f69d..595a9428eda 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
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountIndex;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\OrderHistory;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\ObjectManager;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\ObjectManager;
/**
* Class AssertOrderNotVisibleOnMyAccount
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 828155468a5..2c7a6342539 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderOnHoldFailMessage
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 0ac614fd935..38d9ff38c11 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderOnHoldSuccessMessage
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 425e708fea9..a672710661d 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderReleaseFailMessage
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 6844fa76977..2fd559d9a3c 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderReleaseSuccessMessage
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 401787f3347..4e6788febec 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderStatusNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderStatusDuplicateStatus
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 c9cab376d3b..de3cd7e0311 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
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderStatus;
use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderStatusInGrid
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 9c9179d9949..dc5d15ca4eb 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
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderStatusIsCorrect
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 494b6f7fa8a..5fa8631ae83 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
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderStatus;
use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderStatusNotAssigned
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 a68f4baa558..e75979c4823 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderStatusSuccessAssignMessage
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 760d8e0bae3..486b801dbed 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderStatusSuccessCreateMessage
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 1f6465ab0ae..bc30beb1c1e 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderStatusSuccessUnassignMessage
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 d5a501662a8..11582827fd8 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrderSuccessCreateMessage
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 36067368dd8..5f6e0e6dc22 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
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertOrdersInOrdersGrid
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 078aaaac153..ac10f702107 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
@@ -8,8 +8,8 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Block\Adminhtml\Order\Create\Items;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Assert product was added to Items Ordered grid in customer account on Order creation page backend.
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 a821193e2b1..21e33cea1ef 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
@@ -10,7 +10,7 @@ use Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\CreditMemos\Grid;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertRefundInCreditMemoTab
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 ffdaf05743f..9583a712ade 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
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\CreditMemoIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertRefundInRefundsGrid
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 fd74aa59a15..d619f949f4e 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertRefundSuccessCreateMessage
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 0d3aad30ad1..46e188fe74d 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
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertReorderStatusIsCorrect
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 01e8c1ca908..8c6c78230ea 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
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 362a43cd644..586d9925e8a 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 f50ada3b171..dab302d4283 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
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* 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 bc359b7f343..05940cb7bc5 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
@@ -7,8 +7,8 @@
namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* 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 fa07944b9ed..dc9aab4a6a6 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
@@ -9,7 +9,7 @@ namespace Magento\Sales\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUnholdButton
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
index 16b7520120f..352f7527840 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesOrderShipmentNew.php
@@ -6,9 +6,9 @@
namespace Magento\Sales\Test\Page;
-use Mtf\Client\Locator;
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Page\Page;
/**
* Class SalesOrder
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddProductsStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddProductsStep.php
index 7106416ff98..ed71060eb94 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddProductsStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddProductsStep.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class AddProductsStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddRecentlyViewedProductsToCartStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddRecentlyViewedProductsToCartStep.php
index 3955d13be00..d995a2c7829 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddRecentlyViewedProductsToCartStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/AddRecentlyViewedProductsToCartStep.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Add Recently Viewed Products to cart.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ConfigureProductsStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ConfigureProductsStep.php
index 887a578b216..af0c71dbfcd 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ConfigureProductsStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ConfigureProductsStep.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Configure products options on backend order.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateNewOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateNewOrderStep.php
index c0c320d6257..72b6789e700 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateNewOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateNewOrderStep.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class CreateNewOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php
index 21519711065..a5931b05e83 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/FillBillingAddressStep.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\TestStep;
use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Fill Sales Data.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/OpenSalesOrdersStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/OpenSalesOrdersStep.php
index 6deab5e8fe9..1be4db95171 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/OpenSalesOrdersStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/OpenSalesOrdersStep.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class OpenSalesOrdersStep
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 f191f322df9..a810a3ca608 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
@@ -7,8 +7,8 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\SalesGuestView;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Click on "Print Order" button.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php
index b3f7eaa7a0d..8485a0831ba 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/ReorderStep.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class ReorderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectCustomerOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectCustomerOrderStep.php
index a88e41d3bfb..8c1d84dd8ea 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectCustomerOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectCustomerOrderStep.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\TestStep;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class SelectCustomerOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectPaymentMethodForOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectPaymentMethodForOrderStep.php
index 9c523d6db89..73b774cb7c3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectPaymentMethodForOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectPaymentMethodForOrderStep.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class SelectPaymentMethodForOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectShippingMethodForOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectShippingMethodForOrderStep.php
index 96dffd305c8..8b9a8d370cf 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectShippingMethodForOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectShippingMethodForOrderStep.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class SelectShippingMethodForOrderStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectStoreStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectStoreStep.php
index d3945c15ad7..d8e82f4e2bc 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectStoreStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SelectStoreStep.php
@@ -8,7 +8,7 @@ namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
use Magento\Store\Test\Fixture\Store;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class SelectStoreStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
index 0623946e4c2..f9195c37875 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Submit Order step.
@@ -46,7 +46,7 @@ class SubmitOrderStep implements TestStepInterface
* @param FixtureFactory $fixtureFactory
* @param CustomerInjectable $customer
* @param AddressInjectable $billingAddress
- * @param \Mtf\Fixture\FixtureInterface[] $products
+ * @param \Magento\Mtf\Fixture\FixtureInterface[] $products
*/
public function __construct(
OrderCreateIndex $orderCreateIndex,
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/UpdateProductsDataStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/UpdateProductsDataStep.php
index 8302240bdd7..525b5b430ed 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/UpdateProductsDataStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/UpdateProductsDataStep.php
@@ -7,7 +7,7 @@
namespace Magento\Sales\Test\TestStep;
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class UpdateProductsDataStep
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/scenario.xml
index a6d5580a481..fb2d6e3eb72 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/scenario.xml
@@ -5,7 +5,7 @@
* See COPYING.txt for license details.
*/
-->
-<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Config/etc/scenario.xsd">
+<scenarios xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Config/etc/scenario.xsd">
<scenario name="ReorderOrderEntityTest" module="Magento_Sales">
<methods>
<method name="test">
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
index 0a66291ccb3..9b4b3aa98ac 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking.php
@@ -7,8 +7,8 @@
namespace Magento\Shipping\Test\Block\Adminhtml\Order;
use Magento\Shipping\Test\Block\Adminhtml\Order\Tracking\Item;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Tracking
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.php
index dd3d4c01703..df2c3cc1a8e 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Order/Tracking/Item.php
@@ -6,7 +6,7 @@
namespace Magento\Shipping\Test\Block\Adminhtml\Order\Tracking;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class Item
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
index 35fa2ad6ba3..b5ca395ff72 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Info.php
@@ -6,7 +6,7 @@
namespace Magento\Shipping\Test\Block\Order;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Info block on order's view page.
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
index ab83982457a..49622968407 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment.php
@@ -7,8 +7,8 @@
namespace Magento\Shipping\Test\Block\Order;
use Magento\Shipping\Test\Block\Order\Shipment\Items;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Shipment
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment/Items.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment/Items.php
index 69b2eb4e618..463f84b7f87 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Order/Shipment/Items.php
@@ -6,7 +6,7 @@
namespace Magento\Shipping\Test\Block\Order\Shipment;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Items
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 8a0b406fee8..ae61d24ecd1 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
@@ -9,7 +9,7 @@ namespace Magento\Shipping\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertNoShipButton
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 ee51687746f..144fab6e4b9 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
@@ -8,7 +8,7 @@ namespace Magento\Shipping\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Shipping\Test\Page\Adminhtml\ShipmentIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertShipmentInShipmentsGrid
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 abb101e24fa..76997e744f7 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
@@ -9,7 +9,7 @@ namespace Magento\Shipping\Test\Constraint;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertShipmentInShipmentsTab
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 68a79182af9..84d5d5ff797 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
@@ -10,7 +10,7 @@ use Magento\Sales\Test\Constraint\AbstractAssertItems;
use Magento\Sales\Test\Fixture\OrderInjectable;
use Magento\Shipping\Test\Page\Adminhtml\SalesShipmentView;
use Magento\Shipping\Test\Page\Adminhtml\ShipmentIndex;
-use Mtf\ObjectManager;
+use Magento\Mtf\ObjectManager;
/**
* Class AssertShipmentItems
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 adffababcc3..ce32f38f424 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
@@ -7,7 +7,7 @@
namespace Magento\Shipping\Test\Constraint;
use Magento\Sales\Test\Page\Adminhtml\OrderView;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertShipmentSuccessCreateMessage
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 ca2bce698bb..2caba99cd14 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
@@ -7,7 +7,7 @@
namespace Magento\Shipping\Test\Constraint;
use Magento\Sales\Test\Page\SalesGuestPrint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Assert that shipping method was printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Fixture/Method.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Fixture/Method.php
index 00d76e69013..9c4d0378312 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Fixture/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Fixture/Method.php
@@ -6,8 +6,8 @@
namespace Magento\Shipping\Test\Fixture;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
/**
* Class Method
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/Method.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/Method.php
index 7bb948e124e..6f13fc81e55 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/Method.php
@@ -6,7 +6,7 @@
namespace Magento\Shipping\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Method Repository
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
index 5201105d7b0..2781dec51ad 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Block/Adminhtml/SitemapGrid.php
@@ -7,7 +7,7 @@
namespace Magento\Sitemap\Test\Block\Adminhtml;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Locator;
/**
* Class SitemapGrid
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 a193569f961..d476d23c66c 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
@@ -11,7 +11,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\Cms\Test\Fixture\CmsPage;
use Magento\Sitemap\Test\Fixture\Sitemap;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSitemapContent
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 96efcf67f95..3dbdc67069c 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
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
use Magento\Sitemap\Test\Fixture\Sitemap;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSitemapFailFolderSaveMessage
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 75aadae7fed..62beed7801a 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
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
use Magento\Sitemap\Test\Fixture\Sitemap;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSitemapFailPathSaveMessage
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 c39dfeb0baa..4e0ed7081b8 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
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
use Magento\Sitemap\Test\Fixture\Sitemap;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSitemapInGrid
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 8aa3253d769..3b9c67aba37 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
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
use Magento\Sitemap\Test\Fixture\Sitemap;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSitemapNotInGrid
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 d3665d2124b..ea5001caa1f 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
@@ -7,7 +7,7 @@
namespace Magento\Sitemap\Test\Constraint;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSitemapSuccessDeleteMessage
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 c9939c74e8d..77e58ce48e1 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
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
use Magento\Sitemap\Test\Fixture\Sitemap;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSitemapSuccessGenerateMessage
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 cd540c0045e..4cd76f6839c 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
@@ -8,7 +8,7 @@ namespace Magento\Sitemap\Test\Constraint;
use Magento\Sitemap\Test\Fixture\Sitemap;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSitemapSuccessSaveAndGenerateMessages
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 0d78b7b7b58..d2c8eec1793 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
@@ -7,7 +7,7 @@
namespace Magento\Sitemap\Test\Constraint;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSitemapSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php
index 2984eaf8436..d2d40bd3713 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Fixture/Sitemap.php
@@ -6,7 +6,7 @@
namespace Magento\Sitemap\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Sitemap
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php
index 839745e0da0..103986e35d0 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/Curl.php
@@ -8,12 +8,12 @@ namespace Magento\Sitemap\Test\Handler\Sitemap;
use Magento\Backend\Test\Handler\Extractor;
use Magento\Sitemap\Test\Handler\Sitemap;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/SitemapInterface.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/SitemapInterface.php
index 87c9938c46f..97246710c6e 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/SitemapInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Handler/Sitemap/SitemapInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Sitemap\Test\Handler\Sitemap;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface SitemapInterface
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php
index 80077b4fead..a2f28611e98 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Repository/Sitemap.php
@@ -6,7 +6,7 @@
namespace Magento\Sitemap\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Sitemap
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
index 0f0ffb725bf..9a6cec214f0 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Sitemap\Test\TestCase;
use Magento\Sitemap\Test\Fixture\Sitemap;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Cover creating SitemapEntity
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php
index b2532e34c27..56371fb69ad 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Sitemap\Test\TestCase;
use Magento\Sitemap\Test\Fixture\Sitemap;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapEdit;
use Magento\Sitemap\Test\Page\Adminhtml\SitemapIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Cover deleting Sitemap Entity
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php b/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
index b720f842307..5883250551f 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Block/Switcher.php
@@ -8,8 +8,8 @@
namespace Magento\Store\Test\Block;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Switcher
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 b23de9b65c6..feb77c84296 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
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\SystemConfig;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreBackend
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 07ab89295c4..be32892ca3d 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
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Backend\Test\Page\Adminhtml\StoreNew;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertStoreForm
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 1c3fba6f7b4..3691c6d21e1 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
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreFrontend
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 969adc59fa1..59c77b4e2be 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
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\EditGroup;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertStoreGroupForm
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 d402b84f8a7..51e0cd19cf5 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
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreGroupInGrid
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 1e7a5cbc7d0..c17267d296e 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
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreGroupNotInGrid
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 d82b5c9636e..e36072fade0 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
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Backend\Test\Page\Adminhtml\StoreNew;
use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreGroupOnStoreViewForm
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 2dd98986320..b68b514a232 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
@@ -7,7 +7,7 @@
namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreGroupSuccessDeleteAndBackupMessages
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 899edb2064a..b69285e49ba 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
@@ -7,7 +7,7 @@
namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreGroupSuccessDeleteMessage
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 73cf65fd967..1f78d946c06 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
@@ -7,7 +7,7 @@
namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreGroupSuccessSaveMessage
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 f1532c19a5d..b5078cc68bb 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
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreInGrid
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 8868f0e5a2f..a83a6a1954c 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
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreNotInGrid
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 df68a3e6765..ab89a1a07bf 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
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreNotOnFrontend
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 4301b9f84ad..c91f10875d0 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
@@ -7,7 +7,7 @@
namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreSuccessDeleteAndBackupMessages
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 69f628c67ba..4f5f9edf213 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
@@ -7,7 +7,7 @@
namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreSuccessDeleteMessage
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 5ab2242d983..9d12f218708 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
@@ -7,7 +7,7 @@
namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertStoreSuccessSaveMessage
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 c3f541646f3..757658db8bf 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
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\EditWebsite;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\Website;
-use Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Constraint\AbstractAssertForm;
/**
* Class AssertWebsiteForm
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 157d0630bc0..0656425f75e 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
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\Website;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertWebsiteInGrid
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 721b12c5b91..9c5dd627e30 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
@@ -8,7 +8,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\Website;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertWebsiteNotInGrid
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 8db25588f26..c7d76580c26 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
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\NewGroupIndex;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\Website;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertWebsiteOnStoreForm
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 5e925097b06..eee0dd61344 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
@@ -7,7 +7,7 @@
namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertWebsiteSuccessDeleteAndBackupMessages
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 8f8dd74ea79..c0e0f791c68 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
@@ -7,7 +7,7 @@
namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertWebsiteSuccessDeleteMessage
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 eb1f08c3640..11bc68e2fc2 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
@@ -7,7 +7,7 @@
namespace Magento\Store\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertWebsiteSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php
index 081711218f0..5762f119fe3 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store.php
@@ -6,7 +6,7 @@
namespace Magento\Store\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Store
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php
index da70439f612..9ec18c42b26 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Store/GroupId.php
@@ -7,8 +7,8 @@
namespace Magento\Store\Test\Fixture\Store;
use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class GroupId
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php
index b19288b37e0..04dd14411c3 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup.php
@@ -6,7 +6,7 @@
namespace Magento\Store\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class StoreGroup
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/CategoryId.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/CategoryId.php
index 7b3c07070f1..ca4f11663f3 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/CategoryId.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/CategoryId.php
@@ -7,8 +7,8 @@
namespace Magento\Store\Test\Fixture\StoreGroup;
use Magento\Catalog\Test\Fixture\Category;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class CategoryId
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/WebsiteId.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/WebsiteId.php
index 47d8dabac75..36e20106ce0 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/WebsiteId.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/StoreGroup/WebsiteId.php
@@ -7,8 +7,8 @@
namespace Magento\Store\Test\Fixture\StoreGroup;
use Magento\Store\Test\Fixture\Website;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class WebsiteId
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php
index 0dc41b477a6..c680e52135c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Fixture/Website.php
@@ -6,7 +6,7 @@
namespace Magento\Store\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class Website
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php
index 421b937acd4..7e21102b92f 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Store\Test\Handler\Store;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/StoreInterface.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/StoreInterface.php
index 034b22d0ba9..87670c64cc8 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/StoreInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/StoreInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Store\Test\Handler\Store;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface StoreInterface
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
index 3aa9a6ce920..2b0c1abbdde 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Store\Test\Handler\StoreGroup;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/StoreGroupInterface.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/StoreGroupInterface.php
index 6b57419e518..9af46f18ae9 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/StoreGroupInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/StoreGroupInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Store\Test\Handler\StoreGroup;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface StoreGroupInterface
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
index 671d46f4a8d..9eb58a1be26 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Store\Test\Handler\Website;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/WebsiteInterface.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/WebsiteInterface.php
index c3f167b26d4..2f808d76077 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/WebsiteInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/WebsiteInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Store\Test\Handler\Website;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface WebsiteInterface
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php
index b839bb08082..472aa3028cb 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Store.php
@@ -6,7 +6,7 @@
namespace Magento\Store\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Store
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php
index a51aaba9daf..fa01d8b222c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.php
@@ -6,7 +6,7 @@
namespace Magento\Store\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class StoreGroup
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php
index 97cef07a17e..7e0fce6fd06 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Repository/Website.php
@@ -6,7 +6,7 @@
namespace Magento\Store\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Website
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
index 599af73acab..3e796d62655 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Backend\Test\Page\Adminhtml\StoreNew;
use Magento\Store\Test\Fixture\Store;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateStoreEntity (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php
index 1e6bd58ef9e..6edc800dfea 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
use Magento\Backend\Test\Page\Adminhtml\NewGroupIndex;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Create New StoreGroup (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php
index 3a38433e089..59b40358b13 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
use Magento\Backend\Test\Page\Adminhtml\NewWebsiteIndex;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\Website;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Create Website (Store Management)
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 27a058334a5..debf3cb6b6e 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
@@ -11,7 +11,7 @@ use Magento\Backend\Test\Page\Adminhtml\StoreDelete;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
use Magento\Store\Test\Fixture\Store;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteStoreEntity
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 b6eab430a1f..94f044c26e0 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
@@ -11,7 +11,7 @@ use Magento\Backend\Test\Page\Adminhtml\EditGroup;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Delete StoreGroup (Store Management)
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 0fc93a94ef4..b540e04277f 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
@@ -11,7 +11,7 @@ use Magento\Backend\Test\Page\Adminhtml\EditWebsite;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
use Magento\Store\Test\Fixture\Website;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Delete Website (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php
index 5f316bdd793..ab189ce3530 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php
@@ -8,8 +8,8 @@
namespace Magento\Store\Test\TestCase;
-use Mtf\Factory\Factory;
-use Mtf\TestCase\Functional;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\TestCase\Functional;
class StoreTest extends Functional
{
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php
index 9ac015f936d..9ead46a3f63 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
use Magento\Backend\Test\Page\Adminhtml\EditStore;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\Store;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateStoreEntity (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php
index 555e6a7a054..5ec7ac7473b 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Store\Test\TestCase;
use Magento\Backend\Test\Page\Adminhtml\EditGroup;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\StoreGroup;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Update StoreGroup (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php
index 7feb6fa8811..d1760123b0a 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\Store\Test\TestCase;
use Magento\Backend\Test\Page\Adminhtml\EditWebsite;
use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
use Magento\Store\Test\Fixture\Website;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Update Website (Store Management)
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rate/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rate/Edit/Form.php
index 8dfbf12c72c..e488aa8dc20 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rate/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rate/Edit/Form.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Block\Adminhtml\Rate\Edit;
-use Mtf\Block\Form as ParentForm;
+use Magento\Mtf\Block\Form as ParentForm;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
index d18b7e47876..41e9135fcad 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php
@@ -6,11 +6,11 @@
namespace Magento\Tax\Test\Block\Adminhtml\Rule\Edit;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Block\Form as FormInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Block\Form as FormInterface;
/**
* Form for tax rule creation.
@@ -276,7 +276,7 @@ class Form extends FormInterface
return $element->isVisible() ? true : null;
}
);
- /** @var \Mtf\Client\Element\MultiselectlistElement $taxRates */
+ /** @var \Magento\Mtf\Client\Element\MultiselectlistElement $taxRates */
$taxRates = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
return $taxRates->getAllValues();
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php
index ea3b07e2e79..30ee5301714 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Block\Adminhtml\Rule\Edit;
-use Mtf\Block\Form as FormInterface;
+use Magento\Mtf\Block\Form as FormInterface;
/**
* Class TaxRate
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
index 03aeedefc59..86a0ded5cc9 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
@@ -11,7 +11,7 @@ use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AbstractAssertTaxWithCrossBorderApplying
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 b2cc6ea218b..9be4aa155fa 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
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Fixture\TaxRate;
use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
use Magento\Tax\Test\Page\Adminhtml\TaxRateNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRateForm
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 ab8fb7c249a..b29f483f1ed 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
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Fixture\TaxRate;
use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRateInGrid
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 68698ac0e0e..c7e8b1e65fb 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
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRateInTaxRule
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 1dee8e83326..e8b8e96f9c1 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
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Constraint;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRateIsInCorrectRange
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 6e2b75e92db..27269fc071a 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
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Fixture\TaxRate;
use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRateNotInGrid
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 cec93f5e32d..40a294d79d3 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
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Fixture\TaxRate;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRateNotInTaxRule
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 e986b9afc8a..5a2eeb5608e 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
@@ -7,7 +7,7 @@
namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRateSuccessDeleteMessage
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 c463dd61c07..daa156986bb 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
@@ -7,7 +7,7 @@
namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRateSuccessSaveMessage
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
index 9102196b166..d8000e08d4a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php
@@ -14,9 +14,9 @@ use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAccountLogout;
use Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* Class AssertTaxRuleApplying
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 06364e1cad8..2ec54cbe497 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
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Fixture\TaxRule;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRuleForm
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 257db7b916a..fea85573792 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
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Fixture\TaxRule;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRuleInGrid
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 55704a8de1e..bfefccb25c4 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
@@ -12,8 +12,8 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Checkout\Test\Page\CheckoutCart;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\AddressInjectable;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
/**
* Class AssertTaxRuleIsAppliedToAllPrice
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 b7cb74fc33b..0d5d85d1bcc 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
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Fixture\TaxRule;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRuleNotInGrid
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 590f9a435e0..6649a25316e 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
@@ -7,7 +7,7 @@
namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertTaxRuleSuccessDeleteMessage
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 9dec5c65b37..1507e373dc2 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
@@ -7,7 +7,7 @@
namespace Magento\Tax\Test\Constraint;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertSuccessSavedMessageTaxRule
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php
index 8f161b790ab..1c81488b1fc 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxClass.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class TaxClass
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php
index e61fc1352cf..daea91ae303 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRate.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class TaxRate
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php
index e14f3fb7b54..9655754d1fa 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class TaxRule
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxClass.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxClass.php
index a6c807c364a..997d0600cc7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxClass.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxClass.php
@@ -6,8 +6,8 @@
namespace Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class TaxClass
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxRate.php
index 0bda05d9e92..aacc3a65e7a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxRate.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Fixture/TaxRule/TaxRate.php
@@ -6,8 +6,8 @@
namespace Magento\Tax\Test\Fixture\TaxRule;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class TaxRate
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
index f55a0fe687d..4493f800006 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
@@ -6,12 +6,12 @@
namespace Magento\Tax\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Curl handler remove all tax rules
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/Curl.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/Curl.php
index e9cb9e4883d..636a0e8a686 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Tax\Test\Handler\TaxClass;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/TaxClassInterface.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/TaxClassInterface.php
index 21f7342dd3a..499654912d7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/TaxClassInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxClass/TaxClassInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Handler\TaxClass;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface TaxClassInterface
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/Curl.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/Curl.php
index 2c820b1c6df..99287a49795 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Tax\Test\Handler\TaxRate;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/TaxRateInterface.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/TaxRateInterface.php
index 3c39b84398b..470de7e57fa 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/TaxRateInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRate/TaxRateInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Handler\TaxRate;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface TaxRateInterface
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php
index 97f9abc6dbc..e14120345eb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\Tax\Test\Handler\TaxRule;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/TaxRuleInterface.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/TaxRuleInterface.php
index b48837992af..417b74b1cf7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/TaxRuleInterface.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/TaxRuleInterface.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Handler\TaxRule;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface TaxRuleInterface
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php
index 6c09d879535..071b74555d1 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxClass.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class TaxClass Repository
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php
index 4303c1aaa7d..e5a571dc1d5 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRate.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class TaxRate Repository
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php
index 7da39b35c7d..782ec7e2406 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Repository/TaxRule.php
@@ -6,7 +6,7 @@
namespace Magento\Tax\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class TaxRule Repository
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
index 733572d4fe3..ae00c783d68 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRateEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\TestCase;
use Magento\Tax\Test\Fixture\TaxRate;
use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
use Magento\Tax\Test\Page\Adminhtml\TaxRateNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
index 5749a777173..b4faef417a7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\Tax\Test\TestCase;
use Magento\Tax\Test\Fixture\TaxRule;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php
index fb4cc703df2..4bbdfbe5204 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRateEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\TestCase;
use Magento\Tax\Test\Fixture\TaxRate;
use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
use Magento\Tax\Test\Page\Adminhtml\TaxRateNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php
index 1cb87a55275..aa0fac22b2b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Customer\Test\Fixture\AddressInjectable;
use Magento\Tax\Test\Fixture\TaxRule;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Delete TaxRuleEntity
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
index bed89060ce1..c11e2e5ae85 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\Tax\Test\TestCase;
use Magento\Tax\Test\Fixture\TaxRate;
use Magento\Tax\Test\Page\Adminhtml\TaxRateIndex;
use Magento\Tax\Test\Page\Adminhtml\TaxRateNew;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php
index 053dd03da67..8cd7b7abe08 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php
@@ -9,9 +9,9 @@ namespace Magento\Tax\Test\TestCase;
use Magento\Tax\Test\Fixture\TaxRule;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Flow:
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/DeleteAllTaxRulesStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/DeleteAllTaxRulesStep.php
index 1fe46431402..69b0cb8e487 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/DeleteAllTaxRulesStep.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/DeleteAllTaxRulesStep.php
@@ -8,7 +8,7 @@ namespace Magento\Tax\Test\TestStep;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class DeleteAllTaxRulesStep
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 89562f81596..f670da230ee 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
@@ -7,8 +7,8 @@
namespace Magento\Theme\Test\Block\Html;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
use Magento\Store\Test\Fixture\Store;
/**
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Title.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Title.php
index 0bf70a50cb0..2217609ad80 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Title.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Title.php
@@ -7,7 +7,7 @@
namespace Magento\Theme\Test\Block\Html;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Page title block
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
index 20b864164a5..0326a8150a6 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Topmenu.php
@@ -7,8 +7,8 @@
namespace Magento\Theme\Test\Block\Html;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Topmenu
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
index e88d98aafda..0fd091a16ce 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Links.php
@@ -7,8 +7,8 @@
namespace Magento\Theme\Test\Block;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Page Top Links block.
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 7b7b7a376cc..b5e8f775ea0 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
@@ -7,8 +7,8 @@
namespace Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Category;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
use Magento\Catalog\Test\Fixture\Category;
/**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
index 3c7a45c1471..dcae5848887 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php
@@ -7,9 +7,9 @@
namespace Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Edit;
use Magento\Backend\Test\Block\Widget\Form;
-use Mtf\Client\Element\SimpleElement;
-use Mtf\Client\Element;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class UrlRewriteForm
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
index b0102de16b5..f46e09fdf49 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Selector.php
@@ -7,8 +7,8 @@
namespace Magento\UrlRewrite\Test\Block\Adminhtml;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
/**
* Class Selector
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 4c60ef26a37..389f511e379 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
@@ -8,8 +8,8 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertPageByUrlRewriteIsNotFound
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 1bfbe4ee65e..c1ce42c3f3f 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
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteCategoryInGrid
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 0eb7cfed02d..18184d03e7c 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
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteCategoryNotInGrid
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 5be6d6eec52..ea1f0370eef 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
@@ -8,8 +8,8 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Fixture\Category;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteCategoryRedirect
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 833fce22b43..2241c4fe128 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
@@ -8,8 +8,8 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteCustomRedirect
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 9e98064bcb4..c00e367145d 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
@@ -8,8 +8,8 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteCustomSearchRedirect
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 b10cb73dff2..6b0d9e838dd 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
@@ -7,7 +7,7 @@
namespace Magento\UrlRewrite\Test\Constraint;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteDeletedMessage
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 4b346f2be4f..8235b955751 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
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteInGrid
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 c8b3fbce318..7f2431c0462 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
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteNotInGrid
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 1c149b95920..720dc2915b9 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
@@ -8,9 +8,9 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertUrlRewriteProductRedirect
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 ee74a710c22..6507dd11cdf 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
@@ -7,7 +7,7 @@
namespace Magento\UrlRewrite\Test\Constraint;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteSaveMessage
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 e0b56003bab..60d1fdfc8fa 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
@@ -7,8 +7,8 @@
namespace Magento\UrlRewrite\Test\Constraint;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Client\BrowserInterface;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteSuccessOutsideRedirect
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 2f7fec91332..a54513d48cf 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
@@ -8,7 +8,7 @@ namespace Magento\UrlRewrite\Test\Constraint;
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUrlRewriteUpdatedProductInGrid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php
index 8d8459e15ba..ace141782b5 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite.php
@@ -6,7 +6,7 @@
namespace Magento\UrlRewrite\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class UrlRewrite
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/StoreId.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/StoreId.php
index 8d4cfb7965d..5d234bfab71 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/StoreId.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/StoreId.php
@@ -7,8 +7,8 @@
namespace Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\Store\Test\Fixture\Store;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class StoreId
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
index af5e022660c..44614ad5832 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Fixture/UrlRewrite/TargetPath.php
@@ -6,8 +6,8 @@
namespace Magento\UrlRewrite\Test\Fixture\UrlRewrite;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class TargetPath
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/Curl.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/Curl.php
index b556d3cf36a..d99f658b73c 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/Curl.php
@@ -6,12 +6,12 @@
namespace Magento\UrlRewrite\Test\Handler\UrlRewrite;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/UrlRewriteInterface.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/UrlRewriteInterface.php
index a566d766b43..0651b1c0430 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/UrlRewriteInterface.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Handler/UrlRewrite/UrlRewriteInterface.php
@@ -6,7 +6,7 @@
namespace Magento\UrlRewrite\Test\Handler\UrlRewrite;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface UrlRewriteInterface
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php
index 4c830610af1..0e1b7a3421d 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.php
@@ -6,7 +6,7 @@
namespace Magento\UrlRewrite\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class UrlRewrite
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php
index 6041d62ee58..636a64f31e5 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Create Category Rewrites Entity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php
index 093391036ec..f4e8d5d46f8 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Test\Fixture\CatalogProductSimple;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Product URL Rewrites Entity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php
index 7462cf0db53..75365689598 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\UrlRewrite\Test\TestCase;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Delete Category URL Rewrites Entity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php
index 34b68473758..f5592e87abe 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCustomUrlRewriteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\UrlRewrite\Test\TestCase;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteCustomUrlRewriteEntity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php
index 2fbcc64c07e..c668f0512ea 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteProductUrlRewriteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\UrlRewrite\Test\TestCase;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteProductUrlRewritesEntity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php
index f5825167cbb..25a5f58638c 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCategoryUrlRewriteEntityTest.php
@@ -10,8 +10,8 @@ use Magento\Catalog\Test\Fixture\Category;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateCategoryUrlRewritesEntity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php
index 909577d62f6..c5652832a32 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\UrlRewrite\Test\TestCase;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateCustomUrlRewritesEntity
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php
index a6988a459b4..3b7562540e6 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\UrlRewrite\Test\TestCase;
use Magento\UrlRewrite\Test\Fixture\UrlRewrite;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteEdit;
use Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for Update Product URL Rewrites Entity
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 df293a41289..9578f490e7f 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
@@ -24,8 +24,8 @@
<require>
<urlRewrite class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView"/>
- <product class="Mtf\Fixture\FixtureInterface"/>
- <browser class="Mtf\Client\Browser"/>
+ <product class="Magento\Mtf\Fixture\FixtureInterface"/>
+ <browser class="Magento\Mtf\Client\Browser"/>
</require>
</assertUrlRewriteProductRedirect>
<assertUrlRewriteDeletedMessage module="Magento_UrlRewrite">
@@ -46,7 +46,7 @@
<require>
<catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView"/>
<productRedirect class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
- <browser class="Mtf\Client\Browser"/>
+ <browser class="Magento\Mtf\Client\Browser"/>
</require>
</assertPageByUrlRewriteIsNotFound>
<assertUrlRewriteCustomRedirect module="Magento_UrlRewrite">
@@ -56,14 +56,14 @@
<severity>low</severity>
<require>
<urlRewrite class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
- <browser class="Mtf\Client\Browser"/>
+ <browser class="Magento\Mtf\Client\Browser"/>
</require>
</assertUrlRewriteSuccessOutsideRedirect>
<assertUrlRewriteCustomSearchRedirect module="Magento_UrlRewrite">
<severity>low</severity>
<require>
<urlRewrite class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
- <browser class="Mtf\Client\Browser"/>
+ <browser class="Magento\Mtf\Client\Browser"/>
<categoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView"/>
</require>
</assertUrlRewriteCustomSearchRedirect>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
index 004cbac8bac..dd79a2b7b3c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/Role/Tab/Role.php
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Block\Adminhtml\Role\Tab;
use Magento\Backend\Test\Block\Widget\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Role
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
index 8618a91179f..6f55faf944b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Form.php
@@ -8,8 +8,8 @@ namespace Magento\User\Test\Block\Adminhtml\User\Edit;
use Magento\Backend\Test\Block\Widget\FormTabs;
use Magento\User\Test\Block\Adminhtml\User\Edit\Tab\Roles;
-use Mtf\Client\Element;
-use Mtf\Client\Locator;
+use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Locator;
/**
* Class Form
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Tab/Roles.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Tab/Roles.php
index 8ab5d10db8f..bcf2bebf558 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Tab/Roles.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Edit/Tab/Roles.php
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Block\Adminhtml\User\Edit\Tab;
use Magento\Backend\Test\Block\Widget\Grid;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element;
/**
* Class Roles
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
index cd5bcb1cca3..4b05852ef8d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Block/Adminhtml/User/Tab/Role.php
@@ -6,7 +6,7 @@
namespace Magento\User\Test\Block\Adminhtml\User\Tab;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Backend\Test\Block\Widget\Tab;
/**
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 81b5df0b0dc..787b7e390d6 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
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Constraint;
use Magento\User\Test\Page\Adminhtml\UserEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertAccessTokensErrorRevokeMessage
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 a9797795c84..8f6d0505517 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
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Constraint;
use Magento\User\Test\Page\Adminhtml\UserEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertImpossibleDeleteYourOwnAccount
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 fd69fc3cee7..d44d53f21ca 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
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Constraint;
use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertRoleSuccessSaveMessage
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 7e8a3a35e0c..49e9f3fb36f 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
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
use Magento\User\Test\Fixture\AdminUserRole;
use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertRoleInGrid
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 ec7b5ba0e72..cb67bc0a80e 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
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
use Magento\User\Test\Fixture\AdminUserRole;
use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertRoleNotInGrid
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 2033e0c303a..38f74ad1ead 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
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Constraint;
use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertRoleSuccessDeleteMessage
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 dc4d32653ab..0436e6c60cf 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
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Constraint;
use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertRoleSuccessSaveMessage
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 568cbd551d0..c0a9c0c7155 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
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Constraint;
use Magento\User\Test\Page\Adminhtml\UserEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserDuplicateMessage
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 6f2bf4e896f..1369fa1591d 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
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
use Magento\User\Test\Fixture\User;
use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserInGrid
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 aa8877c54bd..431b9f13c71 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
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
use Magento\User\Test\Fixture\User;
use Magento\User\Test\Page\Adminhtml\UserEdit;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserInvalidEmailMessage
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 08832e25f67..909f581f767 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
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
use Magento\User\Test\Fixture\User;
use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserNotInGrid
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 ebd351e0454..04f22b59e61 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
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserRoleSalesRestrictedAccess
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 72ed5cb755a..c6f7e9e6949 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
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Constraint;
use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserSuccessDeleteMessage
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 5b46a44f3fb..9ec6841c6f9 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
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
use Magento\Backend\Test\Page\AdminAuthLogin;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserSuccessLogOut
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 aa4862434fd..4544f7b69da 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
@@ -9,7 +9,7 @@ namespace Magento\User\Test\Constraint;
use Magento\Backend\Test\Page\AdminAuthLogin;
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
use Magento\User\Test\Fixture\User;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserSuccessLogin
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 9804e38b77b..d401448522e 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
@@ -7,7 +7,7 @@
namespace Magento\User\Test\Constraint;
use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserSuccessSaveMessage
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 156672a6329..7c2be591562 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
@@ -8,7 +8,7 @@ namespace Magento\User\Test\Constraint;
use Magento\Backend\Test\Page\AdminAuthLogin;
use Magento\User\Test\Fixture\User;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertUserWrongCredentialsMessage
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUser.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUser.php
index bd67f84b2de..a0ee8cf951c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUser.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUser.php
@@ -6,10 +6,10 @@
namespace Magento\User\Test\Fixture;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
-use Mtf\ObjectManager;
-use Mtf\System\Config;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\System\Config;
/**
* Fixture with all necessary data for user creation on backend
@@ -47,8 +47,8 @@ class AdminUser extends DataFixture
*/
protected function _initData()
{
- /** @var \Mtf\System\Config $systemConfig */
- $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config');
+ /** @var \Magento\Mtf\System\Config $systemConfig */
+ $systemConfig = ObjectManager::getInstance()->create('Magento\Mtf\System\Config');
$superAdminPassword = $systemConfig->getConfigParam('application/backend_user_credentials/password');
$this->_data = [
'fields' => [
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php
index f88d9fa29c0..88180cf31cb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole.php
@@ -6,7 +6,7 @@
namespace Magento\User\Test\Fixture;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AdminUserRole
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole/InRoleUsers.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole/InRoleUsers.php
index 80908c4f372..eb1f27ccdc8 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole/InRoleUsers.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/AdminUserRole/InRoleUsers.php
@@ -7,8 +7,8 @@
namespace Magento\User\Test\Fixture\AdminUserRole;
use Magento\User\Test\Fixture\User;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class InRoleUsers
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
index d4cb9f01539..d9e1c4638ee 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
@@ -5,7 +5,7 @@
*/
namespace Magento\User\Test\Fixture;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Fixture\DataFixture;
/**
* ACL resources fixture
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Role.php
index ab50e9843b5..acb266f5d6c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Role.php
@@ -6,8 +6,8 @@
namespace Magento\User\Test\Fixture;
-use Mtf\Factory\Factory;
-use Mtf\Fixture\DataFixture;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Fixture\DataFixture;
/**
* Class Role
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php
index 298cac0e659..78053ea189c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User.php
@@ -6,12 +6,12 @@
namespace Magento\User\Test\Fixture;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
-use Mtf\Handler\HandlerFactory;
-use Mtf\Repository\RepositoryFactory;
-use Mtf\System\Config;
-use Mtf\System\Event\EventManagerInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Handler\HandlerFactory;
+use Magento\Mtf\Repository\RepositoryFactory;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\System\Event\EventManagerInterface;
/**
* Class User
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/RoleId.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/RoleId.php
index 641f36f34b5..6ee9c5eb5ed 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/RoleId.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/User/RoleId.php
@@ -7,8 +7,8 @@
namespace Magento\User\Test\Fixture\User;
use Magento\User\Test\Fixture\AdminUserRole;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class RoleId
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/AdminUserRoleInterface.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/AdminUserRoleInterface.php
index 7e2b3c353ef..a7d0408abdb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/AdminUserRoleInterface.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/AdminUserRoleInterface.php
@@ -6,7 +6,7 @@
namespace Magento\User\Test\Handler\AdminUserRole;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface AdminUserRoleInterface
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php
index cbad1e0fbbf..1162d727958 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/AdminUserRole/Curl.php
@@ -7,12 +7,12 @@
namespace Magento\User\Test\Handler\AdminUserRole;
use Magento\Backend\Test\Handler\Extractor;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateRole.php
index a5d600af529..df5f11c9a29 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateRole.php
@@ -7,12 +7,12 @@
namespace Magento\User\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class CreateCategory.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateUser.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateUser.php
index cfbd54c09a3..e3598d51730 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateUser.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Curl/CreateUser.php
@@ -6,12 +6,12 @@
namespace Magento\User\Test\Handler\Curl;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Curl handler for persisting Magento user
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 703441ca08b..23e8ae32230 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
@@ -7,12 +7,12 @@
namespace Magento\User\Test\Handler\User;
use Magento\Backend\Test\Handler\Extractor;
-use Mtf\Fixture\FixtureInterface;
-use Mtf\Handler\Curl as AbstractCurl;
-use Mtf\System\Config;
-use Mtf\Util\Protocol\CurlInterface;
-use Mtf\Util\Protocol\CurlTransport;
-use Mtf\Util\Protocol\CurlTransport\BackendDecorator;
+use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\System\Config;
+use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
/**
* Class Curl
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/UserInterface.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/UserInterface.php
index 887313ad2b9..b18cd5603c8 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/UserInterface.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/UserInterface.php
@@ -6,7 +6,7 @@
namespace Magento\User\Test\Handler\User;
-use Mtf\Handler\HandlerInterface;
+use Magento\Mtf\Handler\HandlerInterface;
/**
* Interface UserInterface
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUser.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUser.php
index cdb7260a837..9046699e1a4 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUser.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUser.php
@@ -6,7 +6,7 @@
namespace Magento\User\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Admin User Repository
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php
index 334fda5055b..5a94b249e72 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/AdminUserRole.php
@@ -6,7 +6,7 @@
namespace Magento\User\Test\Repository;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class AdminUserRole
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/Role.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/Role.php
index 8c533100329..08eb926a06a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/Role.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/Role.php
@@ -6,8 +6,8 @@
namespace Magento\User\Test\Repository;
-use Mtf\Factory\Factory;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\Factory\Factory;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class Abstract Repository
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php
index 16ef63904a2..a8098084f2b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Repository/User.php
@@ -6,8 +6,8 @@
namespace Magento\User\Test\Repository;
-use Mtf\ObjectManager;
-use Mtf\Repository\AbstractRepository;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Repository\AbstractRepository;
/**
* Class User
@@ -24,8 +24,8 @@ class User extends AbstractRepository
*/
public function __construct(array $defaultConfig = [], array $defaultData = [])
{
- /** @var \Mtf\System\Config $systemConfig */
- $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config');
+ /** @var \Magento\Mtf\System\Config $systemConfig */
+ $systemConfig = ObjectManager::getInstance()->create('Magento\Mtf\System\Config');
$superAdminPassword = $systemConfig->getConfigParam('application/backend_user_credentials/password');
$this->_data['default'] = [
'username' => 'admin',
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
index b5ea8fd027a..c77bc0c762a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest.php
@@ -9,8 +9,8 @@ namespace Magento\User\Test\TestCase;
use Magento\User\Test\Fixture\User;
use Magento\User\Test\Page\Adminhtml\UserEdit;
use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateAdminUserEntityTest
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php
index 30918f5c1ca..57ae388e1a3 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.php
@@ -9,7 +9,7 @@ namespace Magento\User\Test\TestCase;
use Magento\User\Test\Fixture\AdminUserRole;
use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for CreateAdminUserRolesEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
index 1d29e314eee..d6d4c9f9deb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
@@ -11,8 +11,8 @@ use Magento\Backend\Test\Page\Adminhtml\Dashboard;
use Magento\User\Test\Fixture\User;
use Magento\User\Test\Page\Adminhtml\UserEdit;
use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteAdminUserEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
index 3e52e0369e7..161917c3b54 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
@@ -12,8 +12,8 @@ use Magento\User\Test\Fixture\AdminUserRole;
use Magento\User\Test\Fixture\User;
use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for DeleteUserRoleEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php
index 7de13a4d502..bdac1186edc 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/RevokeAllAccessTokensForAdminWithoutTokensTest.php
@@ -9,7 +9,7 @@ namespace Magento\User\Test\TestCase;
use Magento\User\Test\Fixture\User;
use Magento\User\Test\Page\Adminhtml\UserEdit;
use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Revoke all access tokens for admin without tokens.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
index 1bbe6addc15..cad7c857bfb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
@@ -11,8 +11,8 @@ use Magento\Backend\Test\Page\Adminhtml\Dashboard;
use Magento\User\Test\Fixture\User;
use Magento\User\Test\Page\Adminhtml\UserEdit;
use Magento\User\Test\Page\Adminhtml\UserIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateAdminUserEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
index 108bafa3026..06a396c982c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
@@ -12,7 +12,7 @@ use Magento\User\Test\Fixture\AdminUserRole;
use Magento\User\Test\Fixture\User;
use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for UpdateAdminUserRoleEntity
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php
index cf96f02228f..003e6640bdf 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UserLoginAfterChangingPermissionsTest.php
@@ -13,8 +13,8 @@ use Magento\User\Test\Page\Adminhtml\UserEdit;
use Magento\User\Test\Page\Adminhtml\UserIndex;
use Magento\User\Test\Page\Adminhtml\UserRoleEditRole;
use Magento\User\Test\Page\Adminhtml\UserRoleIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test that user can login from the first attempt just after his permissions were changed.
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
index c2b55ba69e8..e147152e204 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist.php
@@ -6,7 +6,7 @@
namespace Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab;
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element;
use Magento\Backend\Test\Block\Widget\Tab;
use Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist\Grid;
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 665b8871c81..fd2a372a444 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
@@ -6,8 +6,8 @@
namespace Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist;
-use Mtf\Client\Locator;
-use Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Client\Element\SimpleElement;
/**
* Class Grid
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Sharing.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Sharing.php
index baae2751167..a85bd45da92 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Sharing.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Sharing.php
@@ -6,7 +6,7 @@
namespace Magento\Wishlist\Test\Block\Customer;
-use Mtf\Block\Form;
+use Magento\Mtf\Block\Form;
/**
* Class Sharing
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php
index f3f8ac49c79..30e6dcd8dcc 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist.php
@@ -6,7 +6,7 @@
namespace Magento\Wishlist\Test\Block\Customer;
-use Mtf\Block\Block;
+use Magento\Mtf\Block\Block;
/**
* Class Wishlist
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
index 8763e24ee8e..153f40522c7 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items.php
@@ -7,9 +7,9 @@
namespace Magento\Wishlist\Test\Block\Customer\Wishlist;
use Magento\Wishlist\Test\Block\Customer\Wishlist\Items\Product;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class Items
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
index 26f836e44d9..5f427ca5531 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/Product.php
@@ -6,8 +6,8 @@
namespace Magento\Wishlist\Test\Block\Customer\Wishlist\Items;
-use Mtf\Block\Form;
-use Mtf\Client\Locator;
+use Magento\Mtf\Block\Form;
+use Magento\Mtf\Client\Locator;
/**
* Class Product
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 05eada0d084..0e616a4d881 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
@@ -7,8 +7,8 @@
namespace Magento\Wishlist\Test\Constraint;
use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertAddProductToWishlistSuccessMessage
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 371cce58db2..3bfdd344eb6 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
@@ -7,8 +7,8 @@
namespace Magento\Wishlist\Test\Constraint;
use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertAddProductToWishlistSuccessMessage
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 accea31efaf..791b72d28a9 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
@@ -8,9 +8,9 @@ namespace Magento\Wishlist\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractAssertForm;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertBundleProductDetailsInWishlist
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 d8ed443bf80..afa3f5eb3db 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
@@ -8,8 +8,8 @@ namespace Magento\Wishlist\Test\Constraint;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
use Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist\Grid;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureInterface;
/**
* Class AssertProductInCustomerWishlistOnBackendGrid
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 6f59d50f1d1..8370fbd4a30 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
@@ -9,8 +9,8 @@ namespace Magento\Wishlist\Test\Constraint;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertProductIsPresentInCustomerBackendWishlist
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 f0fee57f93b..88f0192ade2 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
@@ -9,8 +9,8 @@ namespace Magento\Wishlist\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Page\CustomerAccountIndex;
use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertProductIsPresentInWishlist
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 dbd869d0a09..661cfac7c9b 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
@@ -12,8 +12,8 @@ use Magento\Customer\Test\Page\CustomerAccountIndex;
use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAccountLogout;
use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\InjectableFixture;
/**
* Class AssertProductsIsAbsentInWishlist
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 502839a7715..794e8b46076 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
@@ -8,7 +8,7 @@ namespace Magento\Wishlist\Test\Constraint;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertWishlistIsEmpty
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 cd96a7d6117..302e994568d 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
@@ -7,7 +7,7 @@
namespace Magento\Wishlist\Test\Constraint;
use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
/**
* Class AssertWishlistShareMessage
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AbstractWishlistTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AbstractWishlistTest.php
index 643858b155e..b69fa2218ad 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AbstractWishlistTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AbstractWishlistTest.php
@@ -10,9 +10,9 @@ use Magento\Catalog\Test\Page\Product\CatalogProductView;
use Magento\Cms\Test\Page\CmsIndex;
use Magento\Customer\Test\Fixture\CustomerInjectable;
use Magento\Wishlist\Test\Page\WishlistIndex;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\ObjectManager;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\TestCase\Injectable;
/**
* Class AbstractWishlistTest
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 0e9bd4f9b69..342066c81cd 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
@@ -15,8 +15,8 @@ use Magento\Customer\Test\Page\CustomerAccountLogin;
use Magento\Customer\Test\Page\CustomerAccountLogout;
use Magento\Wishlist\Test\Page\WishlistIndex;
use Magento\Wishlist\Test\Page\WishlistShare;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestCase\Injectable;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestCase\Injectable;
/**
* Test Creation for ShareWishlistEntity
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
index 738db597b3a..615da8212ef 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestStep/AddProductsToWishlistStep.php
@@ -7,8 +7,8 @@
namespace Magento\Wishlist\Test\TestStep;
use Magento\Catalog\Test\Page\Product\CatalogProductView;
-use Mtf\Client\BrowserInterface;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
/**
* Class AddProductsToWishlistStep
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/GithubPublicationTests.php
similarity index 98%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/GithubPublicationTests.php
index 415b2955215..69eea437e7e 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/GithubPublicationTests.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\TestSuite;
+namespace Magento\Mtf\TestSuite;
/**
* Test suite prepared for Github Publication
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
similarity index 82%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
index 30d57ac5a5f..1ba2a9bb886 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
@@ -4,11 +4,11 @@
* See COPYING.txt for license details.
*/
-namespace Mtf\TestSuite;
+namespace Magento\Mtf\TestSuite;
-use Mtf\ObjectManager;
-use Mtf\ObjectManagerFactory;
-use Mtf\TestRunner\Configuration;
+use Magento\Mtf\ObjectManager;
+use Magento\Mtf\ObjectManagerFactory;
+use Magento\Mtf\TestRunner\Configuration;
/**
* Class InjectableTests
@@ -70,12 +70,12 @@ class InjectableTests extends \PHPUnit_Framework_TestSuite
/**
* Prepare test suite and apply application state
*
- * @return \Mtf\TestSuite\AppState
+ * @return \Magento\Mtf\TestSuite\AppState
*/
public function prepareSuite()
{
$this->init();
- return $this->objectManager->create('Mtf\TestSuite\AppState');
+ return $this->objectManager->create('Magento\Mtf\TestSuite\AppState');
}
/**
@@ -99,12 +99,12 @@ class InjectableTests extends \PHPUnit_Framework_TestSuite
$confFilePath = realpath(
MTF_BP . '/testsuites/' . $_ENV['testsuite_rule_path'] . '/' . $configurationFileName . '.xml'
);
- /** @var \Mtf\TestRunner\Configuration $testRunnerConfiguration */
- $testRunnerConfiguration = $objectManagerFactory->getObjectManager()->get('\Mtf\TestRunner\Configuration');
+ /** @var \Magento\Mtf\TestRunner\Configuration $testRunnerConfiguration */
+ $testRunnerConfiguration = $objectManagerFactory->getObjectManager()->get('\Magento\Mtf\TestRunner\Configuration');
$testRunnerConfiguration->load($confFilePath);
$testRunnerConfiguration->loadEnvConfig();
- $shared = ['Mtf\TestRunner\Configuration' => $testRunnerConfiguration];
+ $shared = ['Magento\Mtf\TestRunner\Configuration' => $testRunnerConfiguration];
$this->objectManager = $objectManagerFactory->create($shared);
}
}
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/acceptance.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml
similarity index 82%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/acceptance.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml
index 7fc208a5ffe..1f74e74f5ee 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/acceptance.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+ xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testcase">
<allow>
<tag group="test_type" value="acceptance_test" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml
similarity index 75%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml
index 60f1dab5513..a63d9da454d 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+ xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testsuite">
<allow>
<namespace value="Magento" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/bat_ce.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml
similarity index 91%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/bat_ce.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml
index 91356680902..e875401e6e8 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/bat_ce.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+ xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testsuite">
<allow>
<!--Products-->
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_cs.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_cs.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml
index eb0fd76bdba..621c5d1e068 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_cs.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_cs.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+ xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testcase">
<allow>
<tag group="domain" value="CS" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_mx.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_mx.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml
index c6d1305ff3d..12891acd39b 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_mx.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_mx.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+ xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testcase">
<allow>
<tag group="domain" value="MX" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_ps.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_ps.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml
index 2790fcf7ce3..fbbe25a9216 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/domain_ps.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/domain_ps.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+ xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testcase">
<allow>
<tag group="domain" value="PS" />
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
similarity index 95%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
index a4b021b3317..9c14458282a 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/end_to_end_ce.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+ xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testsuite">
<allow>
<!--Product search-->
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/installation.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/installation.xml
index e90f7639de2..262d254fe4c 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/installation.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+ xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testsuite">
<allow>
<module value="Magento_Install"/>
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/mvp.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mvp.xml
similarity index 73%
rename from dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/mvp.xml
rename to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mvp.xml
index c3efd1454f1..220478d47ef 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/mvp.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mvp.xml
@@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+ xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
<rule scope="testcase">
<allow>
<tag group="mvp" value="yes" />
diff --git a/dev/tests/functional/utils/bootstrap.php b/dev/tests/functional/utils/bootstrap.php
index ec750f54b43..b2a8e0792a0 100644
--- a/dev/tests/functional/utils/bootstrap.php
+++ b/dev/tests/functional/utils/bootstrap.php
@@ -14,5 +14,5 @@ $appRoot = dirname(dirname(dirname(dirname(__DIR__))));
require $appRoot . '/app/bootstrap.php';
require __DIR__ . '/../vendor/autoload.php';
-$objectManager = \Mtf\ObjectManagerFactory::getObjectManager();
-\Mtf\ObjectManagerFactory::configure($objectManager);
+$objectManager = \Magento\Mtf\ObjectManagerFactory::getObjectManager();
+\Magento\Mtf\ObjectManagerFactory::configure($objectManager);
diff --git a/dev/tests/functional/utils/generate.php b/dev/tests/functional/utils/generate.php
index 2e63dcb82aa..7aa9b91f0f9 100644
--- a/dev/tests/functional/utils/generate.php
+++ b/dev/tests/functional/utils/generate.php
@@ -5,13 +5,13 @@
*/
require_once dirname(__FILE__) . '/' . 'bootstrap.php';
-$objectManager->create('Mtf\Util\Generate\TestCase')->launch();
-$objectManager->create('Mtf\Util\Generate\Page')->launch();
-$objectManager->create('Mtf\Util\Generate\Fixture')->launch();
-$objectManager->create('Mtf\Util\Generate\Constraint')->launch();
-$objectManager->create('Mtf\Util\Generate\Handler')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\TestCase')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Page')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Fixture')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Constraint')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Handler')->launch();
$objectManager->get('Magento\Framework\App\State')->setAreaCode('frontend');
-$objectManager->create('Mtf\Util\Generate\Repository')->launch();
+$objectManager->create('Magento\Mtf\Util\Generate\Repository')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/constraint.php b/dev/tests/functional/utils/generate/constraint.php
index 70b6d73d413..5dfd019f6c1 100644
--- a/dev/tests/functional/utils/generate/constraint.php
+++ b/dev/tests/functional/utils/generate/constraint.php
@@ -5,5 +5,5 @@
*/
require_once dirname(__DIR__) . '/' . 'bootstrap.php';
-$objectManager->create('Mtf\Util\Generate\Constraint')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Constraint')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/factory.php b/dev/tests/functional/utils/generate/factory.php
index e2bfb6ce2df..05c38495a2d 100644
--- a/dev/tests/functional/utils/generate/factory.php
+++ b/dev/tests/functional/utils/generate/factory.php
@@ -15,7 +15,7 @@ require MTF_BP . '/vendor/autoload.php';
$bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $_SERVER);
$om = $bootstrap->getObjectManager();
-/** @var \Mtf\Util\Generate\Factory $generator */
-$generator = $om->create('Mtf\Util\Generate\Factory');
+/** @var \Magento\Mtf\Util\Generate\Factory $generator */
+$generator = $om->create('Magento\Mtf\Util\Generate\Factory');
$generator->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/fixture.php b/dev/tests/functional/utils/generate/fixture.php
index 9d1581309cd..d2e13c07ba6 100644
--- a/dev/tests/functional/utils/generate/fixture.php
+++ b/dev/tests/functional/utils/generate/fixture.php
@@ -5,5 +5,5 @@
*/
require_once dirname(__DIR__) . '/' . 'bootstrap.php';
-$objectManager->create('Mtf\Util\Generate\Fixture')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Fixture')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/handler.php b/dev/tests/functional/utils/generate/handler.php
index 147aae10f99..2e1b1bc7ef1 100644
--- a/dev/tests/functional/utils/generate/handler.php
+++ b/dev/tests/functional/utils/generate/handler.php
@@ -5,5 +5,5 @@
*/
require_once dirname(__DIR__) . '/' . 'bootstrap.php';
-$objectManager->create('Mtf\Util\Generate\Handler')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Handler')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/page.php b/dev/tests/functional/utils/generate/page.php
index c4cc602d289..f15e030c24c 100644
--- a/dev/tests/functional/utils/generate/page.php
+++ b/dev/tests/functional/utils/generate/page.php
@@ -4,5 +4,5 @@
* See COPYING.txt for license details.
*/
require_once dirname(__DIR__) . '/' . 'bootstrap.php';
-$objectManager->create('Mtf\Util\Generate\Page')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Page')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
diff --git a/dev/tests/functional/utils/generate/repository.php b/dev/tests/functional/utils/generate/repository.php
index 0179cab18c4..5355cf45e75 100644
--- a/dev/tests/functional/utils/generate/repository.php
+++ b/dev/tests/functional/utils/generate/repository.php
@@ -6,5 +6,5 @@
require_once dirname(__DIR__) . '/' . 'bootstrap.php';
$objectManager->get('Magento\Framework\App\State')->setAreaCode('frontend');
-$objectManager->create('Mtf\Util\Generate\Repository')->launch();
-\Mtf\Util\Generate\GenerateResult::displayResults();
+$objectManager->create('Magento\Mtf\Util\Generate\Repository')->launch();
+\Magento\Mtf\Util\Generate\GenerateResult::displayResults();
--
GitLab
From e6825632def67e1e5c1ea9c6912385efd95f3244 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 16:00:57 +0200
Subject: [PATCH 092/120] MAGETWO-32592: MTF Alternative Web Driver pull
request preparation
---
dev/tests/functional/lib/Mtf/Client/Element/Tree.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
index 77d9808e689..499a7d645fd 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/Tree.php
@@ -45,6 +45,7 @@ abstract class Tree extends SimpleElement
*
* @param ElementInterface $target
* @throws \Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function dragAndDrop(ElementInterface $target)
{
--
GitLab
From 7f1da89c6d9a07e668b0ff468e0637aea27f7d5b Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Tue, 20 Jan 2015 08:50:02 -0600
Subject: [PATCH 093/120] MAGETWO-29705: Fixed confusing Filesystem Read/Write
Interfaces
---
.../Magento/Downloadable/Helper/Download.php | 2 +-
.../Filesystem/File/ReadFactoryTest.php | 2 +-
.../Filesystem/File/WriteFactoryTest.php | 2 +-
lib/internal/Magento/Framework/Filesystem.php | 12 ++++++-----
.../Framework/Filesystem/File/ReadFactory.php | 19 +++++-------------
.../Filesystem/File/WriteFactory.php | 20 +++++--------------
6 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index a83b739b5f5..d54c436b781 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -168,7 +168,7 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
// Strip down protocol from path
$path = preg_replace('#.+://#', '', $path);
}
- $this->_handle = $this->fileReadFactory->createWithDriverCode($path, $protocol);
+ $this->_handle = $this->fileReadFactory->create($path, $protocol);
} elseif ($this->_linkType == self::LINK_TYPE_FILE) {
$this->_workingDirectory = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);
$fileExists = $this->_downloadableFile->ensureFileInFilesystem($this->_resourceFile);
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
index ce7d66e4bac..41f52ea7983 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/ReadFactoryTest.php
@@ -30,7 +30,7 @@ class ReadFactoryTest extends \PHPUnit_Framework_TestCase
$driverMock->expects($this->any())->method('isExists')->willReturn(true);
$driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
$factory = new ReadFactory($driverPool);
- $result = $factory->createWithDriverCode('path', 'driverCode');
+ $result = $factory->create('path', 'driverCode');
$this->assertInstanceOf('Magento\Framework\Filesystem\File\Read', $result);
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
index 579cc9766ae..bd9c483346e 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Filesystem/File/WriteFactoryTest.php
@@ -28,7 +28,7 @@ class WriteFactoryTest extends \PHPUnit_Framework_TestCase
$driverMock->expects($this->any())->method('isExists')->willReturn(true);
$driverPool->expects($this->once())->method('getDriver')->willReturn($driverMock);
$factory = new WriteFactory($driverPool);
- $result = $factory->createWithDriverCode('path', 'driverCode');
+ $result = $factory->create('path', 'driverCode');
$this->assertInstanceOf('Magento\Framework\Filesystem\File\Write', $result);
}
diff --git a/lib/internal/Magento/Framework/Filesystem.php b/lib/internal/Magento/Framework/Filesystem.php
index 9429da43b59..6c4e7de35c2 100644
--- a/lib/internal/Magento/Framework/Filesystem.php
+++ b/lib/internal/Magento/Framework/Filesystem.php
@@ -52,21 +52,23 @@ class Filesystem
}
/**
- * Create an instance of directory with write permissions
+ * Create an instance of directory with read permissions
*
- * @param string $code
+ * @param string $directoryCode
+ * @param string $driverCode
* @return \Magento\Framework\Filesystem\Directory\ReadInterface
*/
- public function getDirectoryRead($code)
+ public function getDirectoryRead($directoryCode, $driverCode = DriverPool::FILE)
{
+ $code = $directoryCode . '_' . $driverCode;
if (!array_key_exists($code, $this->readInstances)) {
- $this->readInstances[$code] = $this->readFactory->create($this->getDirPath($code));
+ $this->readInstances[$code] = $this->readFactory->create($this->getDirPath($directoryCode), $driverCode);
}
return $this->readInstances[$code];
}
/**
- * Create an instance of directory with read permissions
+ * Create an instance of directory with write permissions
*
* @param string $directoryCode
* @param string $driverCode
diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
index 1dccce253ac..0c758ce471d 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
@@ -31,23 +31,14 @@ class ReadFactory
* Create a readable file
*
* @param string $path
- * @param DriverInterface $driver
+ * @param DriverInterface|string $driver Driver or driver code
* @return \Magento\Framework\Filesystem\File\ReadInterface
*/
- public function create($path, DriverInterface $driver = null)
+ public function create($path, $driver)
{
+ if (is_string($driver)) {
+ return new Read($path, $this->driverPool->getDriver($driver));
+ }
return new Read($path, $driver);
}
-
- /**
- * Create a readable file
- *
- * @param string $path
- * @param string|null $driverCode
- * @return \Magento\Framework\Filesystem\File\ReadInterface
- */
- public function createWithDriverCode($path, $driverCode)
- {
- return new Read($path, $this->driverPool->getDriver($driverCode));
- }
}
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
index 1a309eb0274..1f0fe8066c5 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
@@ -31,25 +31,15 @@ class WriteFactory
* Create a readable file.
*
* @param string $path
- * @param DriverInterface $driver
+ * @param DriverInterface|string $driver Driver or driver code
* @param string $mode [optional]
* @return Write
*/
- public function create($path, DriverInterface $driver, $mode = 'r')
+ public function create($path, $driver, $mode = 'r')
{
+ if (is_string($driver)) {
+ return new Write($path, $this->driverPool->getDriver($driver), $mode);
+ }
return new Write($path, $driver, $mode);
}
-
- /**
- * Create a readable file.
- *
- * @param string $path
- * @param string $driverCode
- * @param string $mode [optional]
- * @return Write
- */
- public function createWithDriverCode($path, $driverCode, $mode = 'r')
- {
- return new Write($path, $this->driverPool->getDriver($driverCode), $mode);
- }
}
--
GitLab
From ad2be679779f90cfc5184a8c7c811e6785517cef Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Tue, 20 Jan 2015 09:01:53 -0600
Subject: [PATCH 094/120] MAGETWO-29705: Fixed confusing Filesystem Read/Write
Interfaces
---
.../unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
index 0165294a2fd..a80e3f57e3a 100644
--- a/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
+++ b/dev/tests/unit/testsuite/Magento/Downloadable/Helper/DownloadTest.php
@@ -226,7 +226,7 @@ class DownloadTest extends \PHPUnit_Framework_TestCase
$this->fileReadFactory->expects(
$this->once()
)->method(
- 'createWithDriverCode'
+ 'create'
)->will(
$this->returnValue($this->_handleMock)
);
--
GitLab
From 45549012036e7dde1b7e7ea5852236cf55f8ec4e Mon Sep 17 00:00:00 2001
From: Iryna Savchenko <isavchenko@ebay.com>
Date: Tue, 20 Jan 2015 17:31:38 +0200
Subject: [PATCH 095/120] MAGETWO-31363: [MPI] Unit and Integration tests
coverage
---
.../Block/Form/AbstractInstruction.php | 32 +++++++++++
.../Block/Form/Banktransfer.php | 22 +------
.../Block/Form/Cashondelivery.php | 22 +------
.../OfflinePayments/Model/Banktransfer.php | 10 ----
.../OfflinePayments/Model/Observer.php | 10 +++-
.../Payment/Block/Info/Instructions.php | 2 +-
...erTest.php => AbstractInstructionTest.php} | 17 +++---
.../Block/Form/Cashondelivery.php | 37 ------------
.../Block/Info/CheckmoTest.php | 50 +++++++---------
.../Model/BanktransferTest.php | 10 ----
.../Model/CashondeliveryTest.php | 10 ----
.../OfflinePayments/Model/ObserverTest.php | 29 +++++++++-
.../Payment/Block/Info/InstructionsTest.php | 57 +++++++++++--------
13 files changed, 135 insertions(+), 173 deletions(-)
create mode 100644 app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
rename dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/{BanktransferTest.php => AbstractInstructionTest.php} (52%)
delete mode 100644 dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
diff --git a/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php b/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
new file mode 100644
index 00000000000..4ad7357cfda
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Form;
+
+/**
+ * Abstract class for Cash On Delivery and Bank Transfer payment method form
+ */
+abstract class AbstractInstruction extends \Magento\Payment\Block\Form
+{
+ /**
+ * Instructions text
+ *
+ * @var string
+ */
+ protected $_instructions;
+
+ /**
+ * Get instructions text from config
+ *
+ * @return string
+ */
+ public function getInstructions()
+ {
+ if (is_null($this->_instructions)) {
+ $this->_instructions = $this->getMethod()->getInstructions();
+ }
+ return $this->_instructions;
+ }
+}
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
index 1693929cdaa..d71654418a3 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
@@ -8,32 +8,12 @@ namespace Magento\OfflinePayments\Block\Form;
/**
* Block for Bank Transfer payment method form
*/
-class Banktransfer extends \Magento\Payment\Block\Form
+class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
{
- /**
- * Instructions text
- *
- * @var string
- */
- protected $_instructions;
-
/**
* Bank transfer template
*
* @var string
*/
protected $_template = 'form/banktransfer.phtml';
-
- /**
- * Get instructions text from config
- *
- * @return string
- */
- public function getInstructions()
- {
- if (is_null($this->_instructions)) {
- $this->_instructions = $this->getMethod()->getInstructions();
- }
- return $this->_instructions;
- }
}
diff --git a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
index af0850e5860..1e14cabb9ba 100644
--- a/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
+++ b/app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
@@ -8,32 +8,12 @@ namespace Magento\OfflinePayments\Block\Form;
/**
* Block for Cash On Delivery payment method form
*/
-class Cashondelivery extends \Magento\Payment\Block\Form
+class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
{
- /**
- * Instructions text
- *
- * @var string
- */
- protected $_instructions;
-
/**
* Cash on delivery template
*
* @var string
*/
protected $_template = 'form/cashondelivery.phtml';
-
- /**
- * Get instructions text from config
- *
- * @return string
- */
- public function getInstructions()
- {
- if (is_null($this->_instructions)) {
- $this->_instructions = $this->getMethod()->getInstructions();
- }
- return $this->_instructions;
- }
}
diff --git a/app/code/Magento/OfflinePayments/Model/Banktransfer.php b/app/code/Magento/OfflinePayments/Model/Banktransfer.php
index 044dd3301ba..4cc48a57527 100644
--- a/app/code/Magento/OfflinePayments/Model/Banktransfer.php
+++ b/app/code/Magento/OfflinePayments/Model/Banktransfer.php
@@ -39,14 +39,4 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
* @var bool
*/
protected $_isOffline = true;
-
- /**
- * Get instructions text from config
- *
- * @return string
- */
- public function getInstructions()
- {
- return trim($this->getConfigData('instructions'));
- }
}
diff --git a/app/code/Magento/OfflinePayments/Model/Observer.php b/app/code/Magento/OfflinePayments/Model/Observer.php
index 61fc00d5389..bafe632349c 100644
--- a/app/code/Magento/OfflinePayments/Model/Observer.php
+++ b/app/code/Magento/OfflinePayments/Model/Observer.php
@@ -21,9 +21,13 @@ class Observer
{
/** @var \Magento\Sales\Model\Order\Payment $payment */
$payment = $observer->getEvent()->getPayment();
- $banktransfer = \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE;
- if ($payment->getMethod() === $banktransfer) {
- $payment->setAdditionalInformation('instructions', $payment->getMethodInstance()->getInstructions());
+ if ($payment->getMethod() ===
+ \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE
+ ) {
+ $payment->setAdditionalInformation(
+ 'instructions',
+ $payment->getMethodInstance()->getConfigData('instructions')
+ );
}
}
}
diff --git a/app/code/Magento/Payment/Block/Info/Instructions.php b/app/code/Magento/Payment/Block/Info/Instructions.php
index 2caeeb5f2f9..55ffee89fa1 100644
--- a/app/code/Magento/Payment/Block/Info/Instructions.php
+++ b/app/code/Magento/Payment/Block/Info/Instructions.php
@@ -33,7 +33,7 @@ class Instructions extends \Magento\Payment\Block\Info
if (is_null($this->_instructions)) {
$this->_instructions = $this->getInfo()->getAdditionalInformation(
'instructions'
- ) ?: $this->getMethod()->getInstructions();
+ ) ?: $this->getMethod()->getConfigData('instructions');
}
return $this->_instructions;
}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/AbstractInstructionTest.php
similarity index 52%
rename from dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
rename to dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/AbstractInstructionTest.php
index 80eb7a7ac3e..a6ef83d4f0e 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/BanktransferTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/AbstractInstructionTest.php
@@ -5,17 +5,20 @@
*/
namespace Magento\OfflinePayments\Block\Form;
-class BanktransferTest extends \PHPUnit_Framework_TestCase
+class AbstractInstructionTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\OfflinePayments\Block\Form\Banktransfer
+ * @var \Magento\OfflinePayments\Block\Form\AbstractInstruction
*/
- protected $_object;
+ protected $_model;
protected function setUp()
{
- $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_object = $objectManagerHelper->getObject('Magento\OfflinePayments\Block\Form\Banktransfer');
+ $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+ $this->_model = $this->getMockForAbstractClass(
+ 'Magento\OfflinePayments\Block\Form\AbstractInstruction',
+ ['context' => $context]
+ );
}
public function testGetInstructions()
@@ -30,8 +33,8 @@ class BanktransferTest extends \PHPUnit_Framework_TestCase
$method->expects($this->once())
->method('getInstructions')
->willReturn('instructions');
- $this->_object->setData('method', $method);
+ $this->_model->setData('method', $method);
- $this->assertEquals('instructions', $this->_object->getInstructions());
+ $this->assertEquals('instructions', $this->_model->getInstructions());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
deleted file mode 100644
index ba0a899bb48..00000000000
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/Cashondelivery.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\OfflinePayments\Block\Form;
-
-class CashondeliveryTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\OfflinePayments\Block\Form\Cashondelivery
- */
- protected $_object;
-
- protected function setUp()
- {
- $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_object = $objectManagerHelper->getObject('Magento\OfflinePayments\Block\Form\Cashondelivery');
- }
-
- public function testGetInstructions()
- {
- $method = $this->getMock(
- 'Magento\Payment\Model\MethodInterface',
- ['getInstructions', 'getCode', 'getFormBlockType', 'getTitle'],
- [],
- '',
- false
- );
- $method->expects($this->once())
- ->method('getInstructions')
- ->willReturn('instructions');
- $this->_object->setData('method', $method);
-
- $this->assertEquals('instructions', $this->_object->getInstructions());
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
index 88314b0b1af..04748038a9c 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
@@ -10,33 +10,12 @@ class CheckmoTest extends \PHPUnit_Framework_TestCase
/**
* @var \Magento\OfflinePayments\Block\Info\Checkmo
*/
- protected $_object;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_scopeConfig;
+ protected $_model;
protected function setUp()
{
- $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
- $paymentDataMock = $this->getMock('Magento\Payment\Helper\Data', [], [], '', false);
- $this->_scopeConfig = $this->getMock(
- 'Magento\Framework\App\Config\ScopeConfigInterface',
- ['getValue', 'isSetFlag'],
- [],
- '',
- false
- );
- $this->_object = $objectManagerHelper->getObject(
- 'Magento\OfflinePayments\Block\Info\Checkmo',
- [
- 'eventManager' => $eventManager,
- 'paymentData' => $paymentDataMock,
- 'scopeConfig' => $this->_scopeConfig,
- ]
- );
+ $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+ $this->_model = new \Magento\OfflinePayments\Block\Info\Checkmo($context);
}
/**
@@ -48,9 +27,9 @@ class CheckmoTest extends \PHPUnit_Framework_TestCase
$info->expects($this->once())
->method('getAdditionalData')
->willReturn(serialize($details));
- $this->_object->setData('info', $info);
+ $this->_model->setData('info', $info);
- $this->assertEquals($expected, $this->_object->getPayableTo());
+ $this->assertEquals($expected, $this->_model->getPayableTo());
}
/**
@@ -73,9 +52,9 @@ class CheckmoTest extends \PHPUnit_Framework_TestCase
$info->expects($this->once())
->method('getAdditionalData')
->willReturn(serialize($details));
- $this->_object->setData('info', $info);
+ $this->_model->setData('info', $info);
- $this->assertEquals($expected, $this->_object->getMailingAddress());
+ $this->assertEquals($expected, $this->_model->getMailingAddress());
}
/**
@@ -88,4 +67,19 @@ class CheckmoTest extends \PHPUnit_Framework_TestCase
['', '']
];
}
+
+ public function testConvertAdditionalDataIsNeverCalled()
+ {
+ $info = $this->getMock('Magento\Payment\Model\Info', ['getAdditionalData'], [], '', false);
+ $info->expects($this->once())
+ ->method('getAdditionalData')
+ ->willReturn(serialize(['mailing_address' => 'blah@blah.com']));
+ $this->_model->setData('info', $info);
+
+ // First we set the property $this->_mailingAddress
+ $this->_model->getMailingAddress();
+
+ // And now we get already setted property $this->_mailingAddress
+ $this->assertEquals('blah@blah.com', $this->_model->getMailingAddress());
+ }
}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
index a8705a4dc8f..18fb24e1ae8 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php
@@ -37,14 +37,4 @@ class BanktransferTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
}
-
- public function testGetInstructions()
- {
- $this->_object->setStore(1);
- $this->_scopeConfig->expects($this->once())
- ->method('getValue')
- ->with('payment/banktransfer/instructions', 'store', 1)
- ->willReturn('payment configuration');
- $this->assertEquals('payment configuration', $this->_object->getInstructions());
- }
}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
index 97bdf1127e5..cd4d60d2753 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php
@@ -39,14 +39,4 @@ class CashondeliveryTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals('Magento\Payment\Block\Info\Instructions', $this->_object->getInfoBlockType());
}
-
- public function testGetInstructions()
- {
- $this->_object->setStore(1);
- $this->_scopeConfig->expects($this->once())
- ->method('getValue')
- ->with('payment/cashondelivery/instructions', 'store', 1)
- ->willReturn('payment configuration');
- $this->assertEquals('payment configuration', $this->_object->getInstructions());
- }
}
diff --git a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
index 34f9c0da865..708b25093f5 100644
--- a/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php
@@ -37,13 +37,13 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
->with('instructions', 'payment configuration');
$method = $this->getMock(
'Magento\Payment\Model\MethodInterface',
- ['getInstructions', 'getFormBlockType', 'getTitle', 'getCode'],
+ ['getConfigData', 'getFormBlockType', 'getTitle', 'getCode'],
[],
'',
false
);
$method->expects($this->once())
- ->method('getInstructions')
+ ->method('getConfigData')
->willReturn('payment configuration');
$payment->expects($this->once())
->method('getMethodInstance')
@@ -56,4 +56,29 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
->willReturn($event);
$this->_model->beforeOrderPaymentSave($observer);
}
+
+ public function testBeforeOrderPaymentSaveNoBanktransfer()
+ {
+ $observer = $this->getMock('Magento\Framework\Event\Observer', ['getEvent'], [], '', false);
+ $event = $this->getMock('Magento\Framework\Event', ['getPayment'], [], '', false);
+ $payment = $this->getMock(
+ 'Magento\Sales\Model\Order\Payment',
+ ['getMethod', 'setAdditionalInformation', 'getMethodInstance'],
+ [],
+ '',
+ false
+ );
+ $payment->expects($this->once())
+ ->method('getMethod')
+ ->willReturn('somepaymentmethod');
+ $payment->expects($this->never())
+ ->method('setAdditionalInformation');
+ $event->expects($this->once())
+ ->method('getPayment')
+ ->willReturn($payment);
+ $observer->expects($this->once())
+ ->method('getEvent')
+ ->willReturn($event);
+ $this->_model->beforeOrderPaymentSave($observer);
+ }
}
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php
index 43528a3ce39..7c035de52c8 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/InstructionsTest.php
@@ -12,12 +12,7 @@ namespace Magento\Payment\Block\Info;
class InstructionsTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Object
- */
- protected $_method;
-
- /**
- * @var \Magento\Payment\Model\Info
+ * @var \Magento\Payment\Model\Info|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_info;
@@ -28,28 +23,44 @@ class InstructionsTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_method = new \Magento\Framework\Object();
- $this->_info = $objectManagerHelper->getObject('Magento\Payment\Model\Info');
- $this->_instructions = $objectManagerHelper->getObject('Magento\Payment\Block\Info\Instructions');
-
- $this->_info->setMethodInstance($this->_method);
- $this->_instructions->setInfo($this->_info);
+ $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
+ $this->_instructions = new \Magento\Payment\Block\Info\Instructions($context);
+ $this->_info = $this->getMock('Magento\Payment\Model\Info', [], [], '', false);
+ $this->_instructions->setData('info', $this->_info);
}
- public function testGetInstructionsSetInstructions()
+ public function testGetInstructionAdditionalInformation()
{
- $this->assertNull($this->_instructions->getInstructions());
- $testInstruction = 'first test';
- $this->_method->setInstructions($testInstruction);
- $this->assertEquals($testInstruction, $this->_instructions->getInstructions());
+ $this->_info->expects($this->once())
+ ->method('getAdditionalInformation')
+ ->with('instructions')
+ ->willReturn('get the instruction here');
+ $this->assertEquals('get the instruction here', $this->_instructions->getInstructions());
+
+ // And we get the already setted param $this->_instructions
+ $this->assertEquals('get the instruction here', $this->_instructions->getInstructions());
}
- public function testGetInstructionsSetInformation()
+ public function testGetInstruction()
{
- $this->assertNull($this->_instructions->getInstructions());
- $testInstruction = 'second test';
- $this->_info->setAdditionalInformation('instructions', $testInstruction);
- $this->assertEquals($testInstruction, $this->_instructions->getInstructions());
+ $methodInstance = $this->getMock(
+ 'Magento\Payment\Model\MethodInterface',
+ ['getConfigData', 'getCode', 'getFormBlockType', 'getTitle'],
+ [],
+ '',
+ false
+ );
+ $methodInstance->expects($this->once())
+ ->method('getConfigData')
+ ->with('instructions')
+ ->willReturn('get the instruction here');
+ $this->_info->expects($this->once())
+ ->method('getAdditionalInformation')
+ ->with('instructions')
+ ->willReturn(false);
+ $this->_info->expects($this->once())
+ ->method('getMethodInstance')
+ ->willReturn($methodInstance);
+ $this->assertEquals('get the instruction here', $this->_instructions->getInstructions());
}
}
--
GitLab
From e0b8d87f56ff1e6df26ca81eafb11578aa7ffb70 Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Tue, 20 Jan 2015 09:33:40 -0600
Subject: [PATCH 096/120] MAGETWO-29705: Fixed confusing Filesystem Read/Write
Interfaces
---
.../Magento/Framework/Less/File/Collector/LibraryTest.php | 4 ++--
.../Magento/Framework/View/Asset/MinifiedTest.php | 5 +++--
.../testsuite/Magento/Framework/View/Asset/SourceTest.php | 7 ++++---
.../Magento/Framework/View/Element/TemplateTest.php | 8 +++++---
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php b/dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php
index f5d9ef63f16..396fad99d70 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Less/File/Collector/LibraryTest.php
@@ -72,8 +72,8 @@ class LibraryTest extends \PHPUnit_Framework_TestCase
->will(
$this->returnValueMap(
[
- [DirectoryList::LIB_WEB, $this->libraryDirectoryMock],
- [DirectoryList::THEMES, $this->themesDirectoryMock],
+ [DirectoryList::LIB_WEB, Filesystem\DriverPool::FILE, $this->libraryDirectoryMock],
+ [DirectoryList::THEMES, Filesystem\DriverPool::FILE, $this->themesDirectoryMock],
]
)
);
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php
index 7b501992bca..50e39edc08a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/MinifiedTest.php
@@ -6,6 +6,7 @@
namespace Magento\Framework\View\Asset;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
class MinifiedTest extends \PHPUnit_Framework_TestCase
{
@@ -62,8 +63,8 @@ class MinifiedTest extends \PHPUnit_Framework_TestCase
$this->_filesystem->expects($this->any())
->method('getDirectoryRead')
->will($this->returnValueMap([
- [DirectoryList::STATIC_VIEW, $this->_staticViewDir],
- [DirectoryList::ROOT, $this->_rootDir],
+ [DirectoryList::STATIC_VIEW, DriverPool::FILE, $this->_staticViewDir],
+ [DirectoryList::ROOT, DriverPool::FILE, $this->_rootDir],
]));
$this->_filesystem->expects($this->any())
->method('getDirectoryWrite')
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
index 09c0ac59216..15862f74256 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/SourceTest.php
@@ -7,6 +7,7 @@
namespace Magento\Framework\View\Asset;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverPool;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -245,9 +246,9 @@ class SourceTest extends \PHPUnit_Framework_TestCase
$this->varDir = $this->getMockForAbstractClass('Magento\Framework\Filesystem\Directory\WriteInterface');
$readDirMap = [
- [DirectoryList::ROOT, $this->rootDirRead],
- [DirectoryList::STATIC_VIEW, $this->staticDirRead],
- [DirectoryList::VAR_DIR, $this->varDir],
+ [DirectoryList::ROOT, DriverPool::FILE, $this->rootDirRead],
+ [DirectoryList::STATIC_VIEW, DriverPool::FILE, $this->staticDirRead],
+ [DirectoryList::VAR_DIR, DriverPool::FILE, $this->varDir],
];
$this->filesystem->expects($this->any())
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Element/TemplateTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Element/TemplateTest.php
index 3a3fd0e8709..59f6568e91e 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Element/TemplateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Element/TemplateTest.php
@@ -5,6 +5,8 @@
*/
namespace Magento\Framework\View\Element;
+use Magento\Framework\Filesystem\DriverPool;
+
class TemplateTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -50,9 +52,9 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
$this->_filesystem->expects($this->any())
->method('getDirectoryRead')
->will($this->returnValueMap([
- [\Magento\Framework\App\Filesystem\DirectoryList::THEMES, $themesDirMock],
- [\Magento\Framework\App\Filesystem\DirectoryList::APP, $appDirMock],
- [\Magento\Framework\App\Filesystem\DirectoryList::ROOT, $this->rootDirMock],
+ [\Magento\Framework\App\Filesystem\DirectoryList::THEMES, DriverPool::FILE, $themesDirMock],
+ [\Magento\Framework\App\Filesystem\DirectoryList::APP, DriverPool::FILE, $appDirMock],
+ [\Magento\Framework\App\Filesystem\DirectoryList::ROOT, DriverPool::FILE, $this->rootDirMock],
]));
$this->_templateEngine = $this->getMock(
--
GitLab
From c95234e4c589853e905a7350d779f4a1f89126fe Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 17:59:47 +0200
Subject: [PATCH 097/120] MAGETWO-32592: MTF Alternative Web Driver pull
request preparation
---
.../functional/lib/Mtf/Client/Element/LiselectstoreElement.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php b/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
index 0308a312ea1..997a7bcf4fa 100644
--- a/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Element/LiselectstoreElement.php
@@ -89,7 +89,7 @@ class LiselectstoreElement extends SimpleElement
protected function getLiElements()
{
$this->driver->find($this->toggleSelector)->click();
- $elements = $this->driver->getElements('li', Locator::SELECTOR_TAG_NAME);
+ $elements = $this->driver->getElements($this, 'li', Locator::SELECTOR_TAG_NAME);
$dropdownData = [];
foreach ($elements as $element) {
$class = $element->getAttribute('class');
--
GitLab
From e34d73955028e7b73e012612dd4fccdd835b0d1e Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Tue, 20 Jan 2015 18:19:41 +0200
Subject: [PATCH 098/120] MAGETWO-15798: Some fields aren't disabled by default
on the webiste scope in System configuration
---
lib/web/mage/adminhtml/form.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
index c6fed3aa5fc..e266ece372a 100644
--- a/lib/web/mage/adminhtml/form.js
+++ b/lib/web/mage/adminhtml/form.js
@@ -458,7 +458,7 @@ FormElementDependenceController.prototype = {
}
} else {
$(idTo).show();
- if (isAnInputOrSelect) {
+ if (isAnInputOrSelect && !isInheritCheckboxChecked) {
$(idTo).disabled = false;
jQuery('#' + idTo).removeClass('ignore-validate');
}
--
GitLab
From 8b90f638bee56a30dd8b9a52b059071111b71bb1 Mon Sep 17 00:00:00 2001
From: Iryna Savchenko <isavchenko@ebay.com>
Date: Tue, 20 Jan 2015 19:59:22 +0200
Subject: [PATCH 099/120] MAGETWO-31363: [MPI] Unit and Integration tests
coverage
---
app/code/Magento/OfflinePayments/Model/Observer.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/app/code/Magento/OfflinePayments/Model/Observer.php b/app/code/Magento/OfflinePayments/Model/Observer.php
index bafe632349c..1cb45ac753f 100644
--- a/app/code/Magento/OfflinePayments/Model/Observer.php
+++ b/app/code/Magento/OfflinePayments/Model/Observer.php
@@ -21,9 +21,7 @@ class Observer
{
/** @var \Magento\Sales\Model\Order\Payment $payment */
$payment = $observer->getEvent()->getPayment();
- if ($payment->getMethod() ===
- \Magento\OfflinePayments\Model\Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE
- ) {
+ if ($payment->getMethod() === Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE) {
$payment->setAdditionalInformation(
'instructions',
$payment->getMethodInstance()->getConfigData('instructions')
--
GitLab
From 4023239c7675f4bd6b82694464030ddb0f7ecde7 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Tue, 20 Jan 2015 20:35:51 +0200
Subject: [PATCH 100/120] MAGETWO-32081: Magento vendor name is used as a home
framework directory
---
.../functional/lib/Magento/Mtf/App/State/AbstractState.php | 3 ++-
.../testsuites/Magento/Mtf/TestSuite/InjectableTests.php | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php b/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
index ad7353b2b53..ef8d88494f1 100644
--- a/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
@@ -39,7 +39,8 @@ abstract class AbstractState implements StateInterface
*/
public function clearInstance()
{
- $dirList = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Framework\Filesystem\DirectoryList');
+ $dirList = \Magento\Mtf\ObjectManagerFactory::getObjectManager()
+ ->get('Magento\Framework\Filesystem\DirectoryList');
$deploymentConfig = new \Magento\Framework\App\DeploymentConfig(
new \Magento\Framework\App\DeploymentConfig\Reader($dirList),
[]
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
index 1ba2a9bb886..1cc1259d981 100644
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php
@@ -100,7 +100,8 @@ class InjectableTests extends \PHPUnit_Framework_TestSuite
MTF_BP . '/testsuites/' . $_ENV['testsuite_rule_path'] . '/' . $configurationFileName . '.xml'
);
/** @var \Magento\Mtf\TestRunner\Configuration $testRunnerConfiguration */
- $testRunnerConfiguration = $objectManagerFactory->getObjectManager()->get('\Magento\Mtf\TestRunner\Configuration');
+ $testRunnerConfiguration = $objectManagerFactory->getObjectManager()
+ ->get('\Magento\Mtf\TestRunner\Configuration');
$testRunnerConfiguration->load($confFilePath);
$testRunnerConfiguration->loadEnvConfig();
--
GitLab
From 37d89b4e590c1e18699db0b5e702f36c6deb4cf0 Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@ebay.com>
Date: Tue, 20 Jan 2015 17:22:14 -0600
Subject: [PATCH 101/120] MAGETWO-29712: [QA] Automate downloadable with taxes
test cases
- fix functional test
---
.../Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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 0a3ab3efe4c..7038e02eb5d 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
@@ -6,8 +6,7 @@
namespace Magento\Sales\Test\Block\Adminhtml\Order;
-use Mtf\Block\Block;
-use Mtf\Client\Locator;
+use Mtf\Block\Form;
/**
* Class Form
--
GitLab
From 3185bfb05df6d0a2ce6a514b315dab998d3ff6a5 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Wed, 21 Jan 2015 10:52:00 +0200
Subject: [PATCH 102/120] MAGETWO-32081: Magento vendor name is used as a home
framework directory
---
.../Test/Integrity/_files/blacklist/reference.txt | 14 ++++++++++++++
1 file changed, 14 insertions(+)
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 c6bac2ba9f3..29a6687221a 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
@@ -51,3 +51,17 @@ Model3
\Magento\TestModule2\Service\V1\Entity\ItemBuilder
\Magento\TestModule4\Service\V1\Entity\DataObjectResponse
\Magento\TestModule4\Service\V1\Entity\DataObjectRequest
+\Magento\Mtf\ObjectManager\Config\Mapper\Dom
+\Magento\Mtf\Data\Argument\Interpreter\Constant
+\Magento\Mtf\Data\Argument\Interpreter\Boolean
+\Magento\Mtf\Data\Argument\Interpreter\String
+\Magento\Mtf\Data\Argument\Interpreter\Number
+\Magento\Mtf\Data\Argument\Interpreter\NullType
+\Magento\Mtf\Data\Argument\Interpreter\Object
+\Magento\Mtf\Data\Argument\Interpreter\Argument
+\Magento\Mtf\Data\Argument\Interpreter\ArrayType
+\Magento\Mtf\Data\Argument\InterpreterInterface
+\Magento\Mtf\Util\Generate\GenerateResult
+\Magento\Mtf\Util\Generate\Repository\Resource
+\Magento\Mtf\Client\Element
+\Magento\Mtf\TestSuite\AppState
\ No newline at end of file
--
GitLab
From 4e769429bc4fb702d89633af112fe288a66012f2 Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Wed, 21 Jan 2015 11:05:22 +0200
Subject: [PATCH 103/120] MAGETWO-31967: Exception page instead of 404 when
edit url for product with required configuration
---
.../Magento/Checkout/Controller/Cart/ConfigureTest.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
index 4a49e870ac2..716661bd022 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -155,10 +155,10 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
{
$quoteId = 1;
$actualProductId = 1;
- $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+ $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
->disableOriginalConstructor()
->getMock();
- $quoteItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item')
+ $quoteItemMock = $this->getMockBuilder('Magento\Quote\Model\Quote\Item')
->disableOriginalConstructor()
->getMock();
$productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
@@ -222,10 +222,10 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
$quotaId = 1;
$productIdInQuota = 1;
$productIdInRequest = null;
- $quoteItemMock = $this->getMockBuilder('Magento\Sales\Model\Quote\Item')
+ $quoteItemMock = $this->getMockBuilder('Magento\Quote\Model\Quote\Item')
->disableOriginalConstructor()
->getMock();
- $quoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+ $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
->disableOriginalConstructor()
->getMock();
$productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
--
GitLab
From 679197bd9019abf152f9c213e76cdd93d352c38e Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Wed, 21 Jan 2015 11:22:42 +0200
Subject: [PATCH 104/120] MAGETWO-25084: [GITHUB] About ByPercent.php under
different currencies #581
---
.../SalesRule/Model/Rule/Action/Discount/ToPercentTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ToPercentTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ToPercentTest.php
index 7163d2680c9..13bec6ff79e 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ToPercentTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ToPercentTest.php
@@ -209,7 +209,7 @@ class ToPercentTest extends \PHPUnit_Framework_TestCase
'amount' => 98,
'baseAmount' => 59.5,
'originalAmount' => 119,
- 'baseOriginalAmount' => 108.5,
+ 'baseOriginalAmount' => 80.5,
],
]
];
--
GitLab
From 63a866675bc447d2d162631e09b2bc3ebe00cbd8 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Wed, 21 Jan 2015 12:31:42 +0200
Subject: [PATCH 105/120] MAGETWO-32081: Magento vendor name is used as a home
framework directory
---
dev/tests/functional/composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 4a3418c0ff5..0cd1467c6a9 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
{
"require": {
- "magento/mtf": "1.0.0-rc13",
+ "magento/mtf": "1.0.0-rc14",
"php": ">=5.4.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
--
GitLab
From 8d9563a7f49d04ccc53b688ac227d2033bf4289b Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Wed, 21 Jan 2015 13:25:51 +0200
Subject: [PATCH 106/120] MAGETWO-31363: [MPI] Unit and Integration tests
coverage
- fix static
---
.../Block/Adminhtml/Carrier/Tablerate/GridTest.php | 9 +++++----
.../Model/Config/Backend/TablerateTest.php | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
index f569f9515dd..09434687725 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
@@ -23,17 +23,17 @@ class GridTest extends \PHPUnit_Framework_TestCase
protected $backendHelperMock;
/**
- * @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $tablerateMock;
/**
- * @var \Magento\Backend\Block\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $context;
/**
- * @var \Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject
*/
protected $collectionFactoryMock;
@@ -53,7 +53,8 @@ class GridTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $this->collectionFactoryMock = $this->getMockBuilder('\Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory')
+ $this->collectionFactoryMock =
+ $this->getMockBuilder('\Magento\OfflineShipping\Model\Resource\Carrier\Tablerate\CollectionFactory')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
index 869c408052d..16ff0b10765 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php
@@ -19,7 +19,8 @@ class TablerateTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->tableateFactoryMock = $this->getMockBuilder('Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory')
+ $this->tableateFactoryMock =
+ $this->getMockBuilder('Magento\OfflineShipping\Model\Resource\Carrier\TablerateFactory')
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
--
GitLab
From 54e0c43e795f93dd5d6077bf9aa74934048e868d Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Wed, 21 Jan 2015 13:36:45 +0200
Subject: [PATCH 107/120] MAGETWO-32782: [TD] Third party interfaces are not
supported by single-tenant compiler
- fix static
---
.../testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php | 2 +-
dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php | 4 +++-
dev/tools/Magento/Tools/Di/Definition/Collection.php | 3 +--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
index 5bfc5e0cc70..a4bb3a8ee73 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
@@ -106,7 +106,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
->willReturnMap($this->getPreferencesMap());
$isConcreteMap = [];
- foreach($definitionCollection->getInstancesNamesList() as $instanceType) {
+ foreach ($definitionCollection->getInstancesNamesList() as $instanceType) {
$isConcreteMap[] = [$instanceType, strpos($instanceType, 'Interface') === false];
$getResolvedConstructorArgumentsMap[] = [
diff --git a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
index 79ce889e6ff..f885f6fd12c 100644
--- a/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
+++ b/dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php
@@ -1,6 +1,5 @@
<?php
/**
- *
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
@@ -150,6 +149,9 @@ class Reader
*
* @param ConfigInterface $config
* @param DefinitionsCollection $definitionsCollection
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ *
+ * @return void
*/
private function fillThirdPartyInterfaces(ConfigInterface $config, DefinitionsCollection $definitionsCollection)
{
diff --git a/dev/tools/Magento/Tools/Di/Definition/Collection.php b/dev/tools/Magento/Tools/Di/Definition/Collection.php
index 2fbde66b294..580f930d24c 100644
--- a/dev/tools/Magento/Tools/Di/Definition/Collection.php
+++ b/dev/tools/Magento/Tools/Di/Definition/Collection.php
@@ -1,6 +1,5 @@
<?php
/**
- *
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
@@ -63,7 +62,7 @@ class Collection
$this->definitions[$instance] = $arguments;
}
- /**+
+ /**
* Returns instance arguments
*
* @param string $instanceName
--
GitLab
From e627582a6bed0866795fee70ecf757120c16761a Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 21 Jan 2015 04:43:40 -0800
Subject: [PATCH 108/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- added phpmd annotations
---
.../Backend/Controller/Adminhtml/System/Account/Save.php | 1 +
app/code/Magento/CatalogRule/Plugin/Model/Product/Action.php | 1 +
app/code/Magento/Cms/Model/Wysiwyg/Config.php | 1 +
app/code/Magento/Customer/Model/GroupManagement.php | 3 +++
app/code/Magento/ProductAlert/Model/Email.php | 1 +
app/code/Magento/Store/Model/Store.php | 1 +
.../Magento/TestFramework/Authentication/Rest/OauthClient.php | 3 +++
.../Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php | 1 +
.../Magento/TestFramework/TestCase/WebapiAbstract.php | 3 +++
.../Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php | 3 +++
.../Magento/CatalogInventory/Api/LowStockItemsTest.php | 1 +
.../Checkout/Service/V1/Address/Shipping/ReadServiceTest.php | 1 +
.../Checkout/Service/V1/ShippingMethod/ReadServiceTest.php | 1 +
.../testsuite/Magento/Customer/Api/AddressMetadataTest.php | 1 +
.../testsuite/Magento/Customer/Api/CustomerMetadataTest.php | 1 +
.../testsuite/Magento/Framework/Stdlib/CookieManagerTest.php | 1 +
.../Integration/Service/V1/CustomerTokenServiceTest.php | 1 +
.../Magento/Sales/Service/V1/OrderAddressUpdateTest.php | 1 +
.../Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php | 1 +
.../testsuite/Magento/Webapi/Routing/ServiceVersionV1Test.php | 1 +
.../Magento/Webapi/WsdlGenerationFromDataObjectTest.php | 2 ++
.../Magento/Backend/Block/System/Config/FormStub.php | 3 +++
.../phpcs/input/naming/constant/minuscule_letter.php | 3 +++
.../phpcs/input/naming/method/normal_underscore_start.php | 3 +++
.../Model/Adapter/Mysql/Filter/PreprocessorTest.php | 3 +++
.../testsuite/Magento/Checkout/Model/Type/OnepageTest.php | 1 +
.../Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php | 1 +
.../Magento/Framework/Code/Reader/SourceArgumentsReader.php | 4 ++++
lib/internal/Magento/Framework/Config/Theme.php | 1 +
lib/internal/Magento/Framework/DB/AbstractMapper.php | 1 +
lib/internal/Magento/Framework/DB/GenericMapper.php | 1 +
lib/internal/Magento/Framework/Object/Mapper.php | 4 ++++
.../Magento/Framework/Search/Adapter/Mysql/Mapper.php | 1 +
lib/internal/Magento/Framework/Search/Request/Mapper.php | 4 ++++
34 files changed, 60 insertions(+)
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
index 0bbf7b3e73c..bbffca9f8eb 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -29,6 +29,7 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
* Saving edited user information
*
* @return \Magento\Backend\Model\View\Result\Redirect
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
diff --git a/app/code/Magento/CatalogRule/Plugin/Model/Product/Action.php b/app/code/Magento/CatalogRule/Plugin/Model/Product/Action.php
index 8824a7be832..115255dcc9a 100644
--- a/app/code/Magento/CatalogRule/Plugin/Model/Product/Action.php
+++ b/app/code/Magento/CatalogRule/Plugin/Model/Product/Action.php
@@ -30,6 +30,7 @@ class Action
* @return ProductAction
*
* @SuppressWarnings(PHPMD.UnusedFormatParameter)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterUpdateAttributes(ProductAction $object, ProductAction $result)
{
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index 3c6e755712a..7fd5b26290d 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -100,6 +100,7 @@ class Config extends \Magento\Framework\Object
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $windowSize
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\Model\UrlInterface $backendUrl,
diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
index 52d557faaa8..d090e955927 100644
--- a/app/code/Magento/Customer/Model/GroupManagement.php
+++ b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -17,6 +17,9 @@ use Magento\Customer\Api\GroupRepositoryInterface;
use Magento\Customer\Api\Data\GroupDataBuilder;
use Magento\Customer\Model\GroupFactory;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
{
const XML_PATH_DEFAULT_ID = 'customer/create_account/default_group';
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index a0435d8775e..94d37b40539 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -285,6 +285,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
* @return bool
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function send()
{
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index bac4f63ef52..442347f72b5 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -22,6 +22,7 @@ use Magento\Framework\Model\AbstractModel;
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
*/
class Store extends AbstractModel implements
\Magento\Framework\App\ScopeInterface,
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
index 6a71b708ac9..ae4604fd1c3 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
@@ -19,6 +19,9 @@ use OAuth\OAuth1\Signature\SignatureInterface;
use OAuth\OAuth1\Token\StdOAuth1Token;
use OAuth\OAuth1\Token\TokenInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class OauthClient extends AbstractService
{
/** @var string|null */
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
index 26ae75ed204..7488f42ae06 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
@@ -62,6 +62,7 @@ class Rest implements \Magento\TestFramework\TestCase\Webapi\AdapterInterface
* {@inheritdoc}
* @throws \LogicException
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function call($serviceInfo, $arguments = [], $storeCode = null)
{
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
index e0f80d3ef43..50cd00f7497 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
@@ -11,6 +11,9 @@ use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Filesystem;
use Magento\Webapi\Model\Soap\Fault;
+/**
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
+ */
abstract class WebapiAbstract extends \PHPUnit_Framework_TestCase
{
/** TODO: Reconsider implementation of fixture-management methods after implementing several tests */
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
index 641256e025b..f62a48e7f09 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
@@ -97,6 +97,7 @@ class ProductCustomOptionRepositoryTest extends WebapiAbstract
/**
* @magentoApiDataFixture Magento/Catalog/_files/product_with_options.php
* @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function testGetList()
{
@@ -138,6 +139,7 @@ class ProductCustomOptionRepositoryTest extends WebapiAbstract
* @magentoApiDataFixture Magento/Catalog/_files/product_without_options.php
* @magentoAppIsolation enabled
* @dataProvider optionDataProvider
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function testSave($optionData)
{
@@ -284,6 +286,7 @@ class ProductCustomOptionRepositoryTest extends WebapiAbstract
* @magentoApiDataFixture Magento/Catalog/_files/product_with_options.php
* @magentoAppIsolation enabled
* @dataProvider validOptionDataProvider
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function testUpdateOptionAddingNewValue($optionType)
{
diff --git a/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/LowStockItemsTest.php b/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/LowStockItemsTest.php
index 564bdbcb41a..bbcf1389aaf 100644
--- a/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/LowStockItemsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/LowStockItemsTest.php
@@ -23,6 +23,7 @@ class LowStockItemsTest extends WebapiAbstract
* @param array $result
* @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
* @dataProvider getLowStockItemsDataProvider
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function testGetLowStockItems($qty, $currentPage, $pageSize, $result)
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/Address/Shipping/ReadServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/Address/Shipping/ReadServiceTest.php
index e732bdf1301..050dec40b18 100644
--- a/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/Address/Shipping/ReadServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/Address/Shipping/ReadServiceTest.php
@@ -94,6 +94,7 @@ class ReadServiceTest extends WebapiAbstract
/**
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function getServiceInfo()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/ShippingMethod/ReadServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/ShippingMethod/ReadServiceTest.php
index 28458e67082..d01b488f605 100644
--- a/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/ShippingMethod/ReadServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/ShippingMethod/ReadServiceTest.php
@@ -116,6 +116,7 @@ class ReadServiceTest extends WebapiAbstract
/**
* @param string $cartId
* @return array
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function getSelectedMethodServiceInfo($cartId)
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressMetadataTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressMetadataTest.php
index 4a85003340c..4f701f7b038 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressMetadataTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressMetadataTest.php
@@ -195,6 +195,7 @@ class AddressMetadataTest extends WebapiAbstract
* @param array $expectedResult
* @param array $actualResult
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function checkValidationRules($expectedResult, $actualResult)
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
index b82ec82b342..d4f80054723 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
@@ -258,6 +258,7 @@ class CustomerMetadataTest extends WebapiAbstract
* @param array $expectedResult
* @param array $actualResult
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function checkValidationRules($expectedResult, $actualResult)
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Framework/Stdlib/CookieManagerTest.php b/dev/tests/api-functional/testsuite/Magento/Framework/Stdlib/CookieManagerTest.php
index c6f10aab550..219416fd6db 100644
--- a/dev/tests/api-functional/testsuite/Magento/Framework/Stdlib/CookieManagerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Framework/Stdlib/CookieManagerTest.php
@@ -152,6 +152,7 @@ class CookieManagerTest extends \Magento\TestFramework\TestCase\WebapiAbstract
* @param string $cookieName
* @param array $cookies
* @return $cookie|null
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
private function findCookie($cookieName, $cookies)
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Integration/Service/V1/CustomerTokenServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Integration/Service/V1/CustomerTokenServiceTest.php
index 03318d3bffa..c565a0e9bb8 100644
--- a/dev/tests/api-functional/testsuite/Magento/Integration/Service/V1/CustomerTokenServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Integration/Service/V1/CustomerTokenServiceTest.php
@@ -83,6 +83,7 @@ class CustomerTokenServiceTest extends WebapiAbstract
/**
* @dataProvider validationDataProvider
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function testCreateCustomerAccessTokenEmptyOrNullCredentials($username, $password)
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderAddressUpdateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderAddressUpdateTest.php
index f1455585d4f..5827ababd9f 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderAddressUpdateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderAddressUpdateTest.php
@@ -20,6 +20,7 @@ class OrderAddressUpdateTest extends WebapiAbstract
/**
* @magentoApiDataFixture Magento/Sales/_files/order.php
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function testOrderAddressUpdate()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
index 99725a43c57..eb34dc77c7c 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
@@ -36,6 +36,7 @@ class OrderStatusHistoryAddTest extends WebapiAbstract
/**
* @magentoApiDataFixture Magento/Sales/_files/order.php
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function testOrderCommentAdd()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/ServiceVersionV1Test.php b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/ServiceVersionV1Test.php
index b576028352f..6061850059d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/ServiceVersionV1Test.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/Routing/ServiceVersionV1Test.php
@@ -71,6 +71,7 @@ class ServiceVersionV1Test extends \Magento\Webapi\Routing\BaseService
/**
* Test get item with any type
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function testItemAnyType()
{
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
index 525cf49359d..23bb628f554 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
@@ -222,6 +222,7 @@ RESPONSE_TYPE;
* Ensure that complex type generated from Data Object is correct.
*
* @param string $wsdlContent
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _checkReferencedTypeDeclaration($wsdlContent)
{
@@ -587,6 +588,7 @@ GENERIC_FAULT_IN_MESSAGES;
/**
* @param string $wsdlContent
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
protected function _checkFaultsComplexTypeSection($wsdlContent)
{
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/System/Config/FormStub.php b/dev/tests/integration/testsuite/Magento/Backend/Block/System/Config/FormStub.php
index cbb8303fc6d..d8b79308b4a 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/System/Config/FormStub.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/System/Config/FormStub.php
@@ -9,6 +9,9 @@
*/
namespace Magento\Backend\Block\System\Config;
+/**
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
class FormStub extends \Magento\Backend\Block\System\Config\Form
{
/**
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
index ae52ab28aed..9f2166f5946 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
@@ -1,6 +1,9 @@
<?php
define('SOME_CONSTaNT_2_ACT_4_YOU', 42);
define("SOME_CONSTaNT_2_ACT_4_YOU", 2783);
+/**
+ * @SuppressWarnings(PHPMD.ConstantNamingConventions)
+ */
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_constant_minuscule_letter
{
const SOME_LONG_CONSTaNT_2_ACT_4_YOU = 1;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
index eb8932a74cc..6fffaa5f938 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
@@ -1,6 +1,9 @@
<?php
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_method_normal_underscore_start
{
+ /**
+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+ */
private function _testFunctionPrivate()
{
}
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/PreprocessorTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/PreprocessorTest.php
index 870a89f5cec..656d52726e0 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/PreprocessorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/PreprocessorTest.php
@@ -10,6 +10,9 @@ use Magento\Framework\DB\Select;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class PreprocessorTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
index 544b3bc1566..7f70068c0bd 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
@@ -385,6 +385,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
* @SuppressWarnings(PHPMD.NPathComplexity)
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function testSaveBilling(
$data,
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
index 021506cdbb6..ffd990dfc3b 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
@@ -7,6 +7,7 @@ namespace Magento\Cms\Controller\Adminhtml\Wysiwyg;
/**
* @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class DirectiveTest extends \PHPUnit_Framework_TestCase
{
diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
index c31fa9c00d8..29b48c744ba 100644
--- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
@@ -18,6 +18,9 @@ class SourceArgumentsReader
* @param \ReflectionClass $class
* @param bool $inherited
* @return array List of constructor argument types.
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited = false)
{
@@ -115,6 +118,7 @@ class SourceArgumentsReader
*
* @param array $file
* @return array
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function getImportedNamespaces(array $file)
{
diff --git a/lib/internal/Magento/Framework/Config/Theme.php b/lib/internal/Magento/Framework/Config/Theme.php
index 893f4dac153..4a68358e353 100644
--- a/lib/internal/Magento/Framework/Config/Theme.php
+++ b/lib/internal/Magento/Framework/Config/Theme.php
@@ -50,6 +50,7 @@ class Theme
*
* @param string $configContent
* @return array
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _extractData($configContent)
{
diff --git a/lib/internal/Magento/Framework/DB/AbstractMapper.php b/lib/internal/Magento/Framework/DB/AbstractMapper.php
index 2bc7d790ded..7a1206c095b 100644
--- a/lib/internal/Magento/Framework/DB/AbstractMapper.php
+++ b/lib/internal/Magento/Framework/DB/AbstractMapper.php
@@ -15,6 +15,7 @@ use Magento\Framework\Object;
/**
* Class AbstractMapper
* @package Magento\Framework\DB
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
abstract class AbstractMapper implements MapperInterface
{
diff --git a/lib/internal/Magento/Framework/DB/GenericMapper.php b/lib/internal/Magento/Framework/DB/GenericMapper.php
index 5b507baf56c..d3e07450ae4 100644
--- a/lib/internal/Magento/Framework/DB/GenericMapper.php
+++ b/lib/internal/Magento/Framework/DB/GenericMapper.php
@@ -87,6 +87,7 @@ class GenericMapper extends AbstractMapper
* @param array $fields
* @throws \Zend_Db_Select_Exception
* @return void
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function mapFields(array $fields)
{
diff --git a/lib/internal/Magento/Framework/Object/Mapper.php b/lib/internal/Magento/Framework/Object/Mapper.php
index bffeefb451d..ffa9bcb041e 100644
--- a/lib/internal/Magento/Framework/Object/Mapper.php
+++ b/lib/internal/Magento/Framework/Object/Mapper.php
@@ -9,6 +9,10 @@
*/
namespace Magento\Framework\Object;
+/**
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ */
class Mapper
{
/**
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
index 959ba62775a..2f8579a79e2 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Mapper.php
@@ -16,6 +16,7 @@ use Magento\Framework\Search\RequestInterface;
/**
* Mapper class. Maps library request to specific adapter dependent query
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Mapper
{
diff --git a/lib/internal/Magento/Framework/Search/Request/Mapper.php b/lib/internal/Magento/Framework/Search/Request/Mapper.php
index 346b5a66039..488880d07a0 100644
--- a/lib/internal/Magento/Framework/Search/Request/Mapper.php
+++ b/lib/internal/Magento/Framework/Search/Request/Mapper.php
@@ -8,6 +8,9 @@ namespace Magento\Framework\Search\Request;
use Magento\Framework\Exception\StateException;
use Magento\Framework\Search\Request\Query\Filter;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Mapper
{
/**
@@ -96,6 +99,7 @@ class Mapper
* @throws \Exception
* @throws \InvalidArgumentException
* @throws StateException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
private function mapQuery($queryName)
{
--
GitLab
From 7f4816b8082acc001d2691e76e16227f7d742c71 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Wed, 21 Jan 2015 15:03:54 +0200
Subject: [PATCH 109/120] MAGETWO-32782: [TD] Third party interfaces are not
supported by single-tenant compiler
- fix static
---
.../testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
index a4bb3a8ee73..0c2f708332f 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ReaderTest.php
@@ -216,7 +216,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
private function getResolvedArguments($arguments)
{
return empty($arguments) ? null : array_map(
- function($argument) {
+ function ($argument) {
return 'resolved_' . $argument;
},
$arguments
--
GitLab
From 956d3e1fe34b97f96399abd7b71554f97a8b8bd4 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 21 Jan 2015 05:23:45 -0800
Subject: [PATCH 110/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- added phpcs annotations
---
.../Magento/Backend/Controller/Adminhtml/System/ConfigTest.php | 3 +++
dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php | 3 +++
.../Framework/Code/Validator/ConstructorArgumentTypesTest.php | 3 +++
.../testsuite/Magento/GoogleShopping/Model/ObserverTest.php | 2 ++
.../Magento/Tools/Di/App/Task/OperationFactoryTest.php | 3 +++
5 files changed, 14 insertions(+)
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/System/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/System/ConfigTest.php
index 3aeb7044dc2..883b43e6ef7 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/System/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/System/ConfigTest.php
@@ -3,6 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Backend\Controller\Adminhtml\System;
use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php b/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php
index 8a94168c895..16f22d824e4 100644
--- a/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php
@@ -3,6 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Weee\Model;
use Magento\Customer\Api\Data\CustomerDataBuilder;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php
index 0de3d403d58..090f0e01598 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php
@@ -3,6 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Framework\Code\Validator;
class ConstructorArgumentTypesTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ObserverTest.php
index 930c52facbf..3ce39e7517b 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ObserverTest.php
@@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\GoogleShopping\Model;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/App/Task/OperationFactoryTest.php b/dev/tests/unit/testsuite/Magento/Tools/Di/App/Task/OperationFactoryTest.php
index c15e189b777..359adca36a6 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/App/Task/OperationFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/App/Task/OperationFactoryTest.php
@@ -3,6 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Tools\Di\App\Task;
class OperationFactoryTest extends \PHPUnit_Framework_TestCase
--
GitLab
From 10400b8836bca35f58bbf4366af966032da75647 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 21 Jan 2015 05:31:58 -0800
Subject: [PATCH 111/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- phpcs annotations added
---
app/code/Magento/Checkout/Model/Type/Onepage.php | 2 ++
app/code/Magento/Customer/Model/AccountManagement.php | 2 ++
app/code/Magento/Customer/Model/Address/Mapper.php | 2 ++
app/code/Magento/Customer/Model/Customer/Mapper.php | 2 ++
.../Customer/Model/Resource/Group/Grid/ServiceCollection.php | 3 +++
.../Sales/Block/Adminhtml/Order/Create/Form/Account.php | 3 +++
6 files changed, 14 insertions(+)
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index ef1b1cf6c27..016d413a7d5 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/
+// @codingStandardsIgnoreFile
+
/**
* One page checkout processing model
*/
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 56871b94ceb..c5c59b797fa 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model;
use Magento\Customer\Api\AccountManagementInterface;
diff --git a/app/code/Magento/Customer/Model/Address/Mapper.php b/app/code/Magento/Customer/Model/Address/Mapper.php
index fe19174210d..3fefe1c52cb 100644
--- a/app/code/Magento/Customer/Model/Address/Mapper.php
+++ b/app/code/Magento/Customer/Model/Address/Mapper.php
@@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model\Address;
use Magento\Customer\Api\Data\AddressInterface;
diff --git a/app/code/Magento/Customer/Model/Customer/Mapper.php b/app/code/Magento/Customer/Model/Customer/Mapper.php
index 92b618edb24..c9f499c8226 100644
--- a/app/code/Magento/Customer/Model/Customer/Mapper.php
+++ b/app/code/Magento/Customer/Model/Customer/Mapper.php
@@ -4,6 +4,8 @@
* See COPYING.txt for license details.
*/
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model\Customer;
use Magento\Customer\Api\Data\CustomerInterface;
diff --git a/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php b/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
index 22980e9d14f..ec1fb6b1be9 100644
--- a/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
+++ b/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
@@ -3,6 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Customer\Model\Resource\Group\Grid;
use Magento\Core\Model\EntityFactory;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index bb259cd7d86..08137358bf7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -3,6 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
+
+// @codingStandardsIgnoreFile
+
namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
use Magento\Framework\Api\ExtensibleDataObjectConverter;
--
GitLab
From d6a05945ff0c53ee6cc163ee981a53d47476ae9f Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 21 Jan 2015 17:33:37 +0200
Subject: [PATCH 112/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- fixed test
---
.../Framework/Test/Utility/FilesTest.php | 21 +++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Test/Utility/FilesTest.php b/dev/tests/unit/testsuite/Magento/Framework/Test/Utility/FilesTest.php
index 480dc93a159..51617860c20 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Test/Utility/FilesTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Test/Utility/FilesTest.php
@@ -44,21 +44,20 @@ class FilesTest extends \PHPUnit_Framework_TestCase
$this->assertSame([], Files::init()->readLists(__DIR__ . '/_files/no_good.txt'));
}
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage The glob() pattern 'bar/unknown' didn't return any result.
- */
public function testReadListsCorruptedDir()
{
- Files::init()->readLists(__DIR__ . '/_files/list_corrupted_dir.txt');
+ $result = Files::init()->readLists(__DIR__ . '/_files/list_corrupted_dir.txt');
+
+ foreach ($result as $path) {
+ $this->assertNotContains('bar/unknown', $path);
+ }
}
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage The glob() pattern 'unknown.txt' didn't return any result.
- */
public function testReadListsCorruptedFile()
{
- Files::init()->readLists(__DIR__ . '/_files/list_corrupted_file.txt');
- }
+ $result = Files::init()->readLists(__DIR__ . '/_files/list_corrupted_file.txt');
+
+ foreach ($result as $path) {
+ $this->assertNotContains('unknown.txt', $path);
+ } }
}
--
GitLab
From 84f7e6673d2ac1170f4ab61c1483c1010b8320a5 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 21 Jan 2015 17:42:12 +0200
Subject: [PATCH 113/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- fixed codestyle error
---
.../testsuite/Magento/Framework/Test/Utility/FilesTest.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Test/Utility/FilesTest.php b/dev/tests/unit/testsuite/Magento/Framework/Test/Utility/FilesTest.php
index 51617860c20..9c7dccdfd0e 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Test/Utility/FilesTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Test/Utility/FilesTest.php
@@ -59,5 +59,6 @@ class FilesTest extends \PHPUnit_Framework_TestCase
foreach ($result as $path) {
$this->assertNotContains('unknown.txt', $path);
- } }
+ }
+ }
}
--
GitLab
From aec208993e9225dd55b315526dac749a3034352e Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 21 Jan 2015 17:50:55 +0200
Subject: [PATCH 114/120] MAGETWO-31575: Remove black/white lists from file
system and builds configuration
- fixed test
---
.../TestFramework/CodingStandard/Tool/CodeSnifferTest.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
index 1c603c48a6b..8f71637e829 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
@@ -40,7 +40,6 @@ class CodeSnifferTest extends \PHPUnit_Framework_TestCase
public function testRun()
{
$whiteList = ['test' . rand(), 'test' . rand()];
- $blackList = ['test' . rand(), 'test' . rand()];
$extensions = ['test' . rand(), 'test' . rand()];
$this->_wrapper->expects($this->once())->method('getDefaults')->will($this->returnValue([]));
@@ -48,17 +47,18 @@ class CodeSnifferTest extends \PHPUnit_Framework_TestCase
$expectedCliEmulation = [
'files' => $whiteList,
'standard' => [self::RULE_SET],
- 'ignored' => $blackList,
'extensions' => $extensions,
'reportFile' => self::REPORT_FILE,
'warningSeverity' => 0,
'reports' => ['checkstyle' => null],
];
+ $this->_tool->setExtensions($extensions);
+
$this->_wrapper->expects($this->once())->method('setValues')->with($this->equalTo($expectedCliEmulation));
$this->_wrapper->expects($this->once())->method('process');
- $this->_tool->run($whiteList, $blackList, $extensions);
+ $this->_tool->run($whiteList);
}
}
--
GitLab
From f1c9fdf61e0e6410e387423dc7205f92728b808b Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Thu, 22 Jan 2015 10:34:51 +0200
Subject: [PATCH 115/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- annotations reverted for test files
---
.../phpcs/input/naming/constant/minuscule_letter.php | 3 ---
.../phpcs/input/naming/method/normal_underscore_start.php | 3 ---
2 files changed, 6 deletions(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
index 9f2166f5946..ae52ab28aed 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/constant/minuscule_letter.php
@@ -1,9 +1,6 @@
<?php
define('SOME_CONSTaNT_2_ACT_4_YOU', 42);
define("SOME_CONSTaNT_2_ACT_4_YOU", 2783);
-/**
- * @SuppressWarnings(PHPMD.ConstantNamingConventions)
- */
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_constant_minuscule_letter
{
const SOME_LONG_CONSTaNT_2_ACT_4_YOU = 1;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
index 6fffaa5f938..eb8932a74cc 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/input/naming/method/normal_underscore_start.php
@@ -1,9 +1,6 @@
<?php
class Magento_Test_Php_Exemplar_CodeStyleTest_phpcs_input_naming_method_normal_underscore_start
{
- /**
- * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
- */
private function _testFunctionPrivate()
{
}
--
GitLab
From 42634153d82a6bff1331b8702c6e9cb2f355fd28 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Thu, 22 Jan 2015 10:53:37 +0200
Subject: [PATCH 116/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- annotations added
---
app/code/Magento/Catalog/Block/Rss/Product/Special.php | 1 +
.../Customer/Model/Resource/Group/Grid/ServiceCollection.php | 1 +
app/code/Magento/CustomerImportExport/Model/Import/Address.php | 1 +
app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php | 1 +
app/code/Magento/Weee/Model/Total/Quote/Weee.php | 1 +
5 files changed, 5 insertions(+)
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
index f9cb008f1b5..d5da4e503b8 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -77,6 +77,7 @@ class Special extends \Magento\Framework\View\Element\AbstractBlock implements D
* @param \Magento\Framework\Stdlib\DateTime\DateFactory $dateFactory
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param array $data
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php b/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
index ec1fb6b1be9..04589231f0b 100644
--- a/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
+++ b/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php
@@ -59,6 +59,7 @@ class ServiceCollection extends AbstractServiceCollection
* @param bool $printQuery
* @param bool $logQuery
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function loadData($printQuery = false, $logQuery = false)
{
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 4f11734d2c4..425c3bab09f 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -585,6 +585,7 @@ class Address extends AbstractCustomer
*
* @param array $defaults
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _saveCustomerDefaults(array $defaults)
{
diff --git a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
index a19ded05b53..efe7c7f63f4 100644
--- a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
@@ -94,6 +94,7 @@ class Freeshipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTota
*
* @param \Magento\Quote\Model\Quote\Address $address
* @return \Magento\OfflineShipping\Model\Quote\Freeshipping
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function fetch(Address $address)
{
diff --git a/app/code/Magento/Weee/Model/Total/Quote/Weee.php b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
index ca6eccc0004..3ba498c70c4 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
@@ -316,6 +316,7 @@ class Weee extends AbstractTotal
*
* @param \Magento\Quote\Model\Quote\Address $address
* @return $this
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function fetch(\Magento\Quote\Model\Quote\Address $address)
{
--
GitLab
From c148d2248b98b6dc4edde8fd659142c43a004b1d Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Thu, 22 Jan 2015 13:30:37 +0200
Subject: [PATCH 117/120] MAGETWO-31578: Implement tool for adding annotations
to existing code
- added phpmd annotations
---
lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index a90a813f8ce..83467bf6bcc 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2453,6 +2453,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @return \Zend_Db_Statement_Interface
* @throws \Zend_Db_Exception
* @throws \Exception
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function addIndex(
$tableName,
@@ -2578,6 +2580,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @param string $schemaName
* @param string $refSchemaName
* @return \Zend_Db_Statement_Interface
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function addForeignKey(
$fkName,
@@ -2692,6 +2695,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @param string $fieldName
* @param integer|string|array $condition
* @return string
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function prepareSqlCondition($fieldName, $condition)
{
@@ -2798,6 +2802,9 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @param array $column the column describe array
* @param mixed $value
* @return mixed
+ *
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function prepareColumnValue(array $column, $value)
{
@@ -3383,6 +3390,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @param string|array $table
* @return string
* @throws \Magento\Framework\DB\DBException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function updateFromSelect(Select $select, $table)
{
--
GitLab
From 19e01b8b24a5903c0daf8eee6c030c60b7d2821b Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Mon, 12 Jan 2015 17:42:46 -0600
Subject: [PATCH 118/120] MAGETWO-31732: Blacklisted ComposerTest
- fixed copyright
---
.../static/testsuite/Magento/Test/Integrity/ComposerTest.php | 4 ++--
lib/internal/Magento/Framework/Composer/MagentoComponent.php | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index 87ee01254e8..43e87f161c7 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -1,8 +1,8 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
-
namespace Magento\Test\Integrity;
use Magento\Framework\Composer\MagentoComponent;
diff --git a/lib/internal/Magento/Framework/Composer/MagentoComponent.php b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
index b73b873e68d..5e2da7bfa55 100644
--- a/lib/internal/Magento/Framework/Composer/MagentoComponent.php
+++ b/lib/internal/Magento/Framework/Composer/MagentoComponent.php
@@ -1,6 +1,7 @@
<?php
/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
*/
namespace Magento\Framework\Composer;
--
GitLab
From 235a6604e15afd5e718cf8796a4afdf6589ec111 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Thu, 15 Jan 2015 14:36:03 -0600
Subject: [PATCH 119/120] MAGETWO-31732: Blacklisted ComposerTest
- added readme for \Magento\Framework\Composer
---
lib/internal/Magento/Framework/Composer/README.md | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 lib/internal/Magento/Framework/Composer/README.md
diff --git a/lib/internal/Magento/Framework/Composer/README.md b/lib/internal/Magento/Framework/Composer/README.md
new file mode 100644
index 00000000000..fc92f73c2db
--- /dev/null
+++ b/lib/internal/Magento/Framework/Composer/README.md
@@ -0,0 +1,2 @@
+**Magento\Framework\Composer** provides Magento-specific features for working with packages.
+ For example, ability to distinguish Magento package and any other package.
--
GitLab
From 8312d10d357639f0a3494b633ed2477c3fc284c2 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 16 Jan 2015 17:23:44 -0600
Subject: [PATCH 120/120] MAGETWO-31732: Blacklisted ComposerTest
- reduced complexity of a test
---
.../Magento/Test/Integrity/ComposerTest.php | 36 ++++++++++++-------
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index 43e87f161c7..97039e89135 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -391,18 +391,7 @@ class ComposerTest extends \PHPUnit_Framework_TestCase
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) {
- if (is_string($element)) {
- $flat[] = [$key, $element];
- } elseif (is_array($element)) {
- foreach ($element as $path) {
- $flat[] = [$key, $path];
- }
- } else {
- throw new \Exception("Unexpected element 'in extra->component_paths' section");
- }
- }
+ $flat = $this->getFlatPathsInfo(self::$rootJson['extra']['component_paths']);
while (list(, list($component, $path)) = each($flat)) {
$this->assertFileExists(
self::$root . '/' . $path,
@@ -424,4 +413,27 @@ class ComposerTest extends \PHPUnit_Framework_TestCase
}
}
}
+
+ /**
+ * @param array $info
+ * @return array
+ * @throws \Exception
+ */
+ private function getFlatPathsInfo(array $info)
+ {
+ $flat = [];
+ foreach ($info as $key => $element) {
+ if (is_string($element)) {
+ $flat[] = [$key, $element];
+ } elseif (is_array($element)) {
+ foreach ($element as $path) {
+ $flat[] = [$key, $path];
+ }
+ } else {
+ throw new \Exception("Unexpected element 'in extra->component_paths' section");
+ }
+ }
+
+ return $flat;
+ }
}
--
GitLab