MAGETWO-56936: [Backport][Github] Allowed countries for customer addr…

…ess in admin using storeview configuration #2946
magento · Sep 8, 2016 · 7edd1d1 · 7edd1d1
1 parent aa31243
commit 7edd1d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/code/Magento/Customer/Setup/UpgradeData.php b/app/code/Magento/Customer/Setup/UpgradeData.php
@@ -19,6 +19,7 @@
 
 /**
  * @codeCoverageIgnore
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UpgradeData implements UpgradeDataInterface
 {
@@ -57,6 +58,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
@@ -40,7 +40,6 @@ protected function assertEqualsSpecificAttributes($expectedProduct, $actualProdu
             $actualAssociatedProductSkus[] = $actualAssociatedProducts[$i]->getSku();
         }
 
-
         $this->assertEquals($expectedAssociatedProductSkus, $actualAssociatedProductSkus);
 
         $expectedProductExtensionAttributes = $expectedProduct->getExtensionAttributes();
-Original file line number
+Diff line change
@@ Expand Up @@
                 $actualAssociatedProductSkus[] = $actualAssociatedProducts[$i]->getSku();
             }
             $this->assertEquals($expectedAssociatedProductSkus, $actualAssociatedProductSkus);
             $expectedProductExtensionAttributes = $expectedProduct->getExtensionAttributes();
@@ Expand Down @@