MAGETWO-63329: Travis build is red for 2.1

slavvka · slavvka · commit e4f39af99157 · 2017-01-19T12:03:59.000+02:00
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
@@ -2616,6 +2616,7 @@ private function getMediaGalleryProcessor()
     /**
      * Set the associated products
      * @param array $productIds
+     * @return void
      */
     public function setAssociatedProductIds(array $productIds)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -86,6 +86,7 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
      * @param Filesystem $filesystem
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
diff --git a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
@@ -93,7 +93,7 @@ private function isMsrpPriceApplicable()
     {
         $moduleManager = $this->getModuleManager();
 
-        if (!$moduleManager->isEnabled('Magento_Msrp') || !$moduleManager->isOutputEnabled('Magento_Msrp') ) {
+        if (!$moduleManager->isEnabled('Magento_Msrp') || !$moduleManager->isOutputEnabled('Magento_Msrp')) {
             return false;
         }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Table/BuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Table/BuilderTest.php
@@ -45,4 +45,3 @@ public function testAddColumn()
         $this->assertEquals($builder, $builder->addColumn('test', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER));
     }
 }
-
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -656,6 +656,7 @@ public function testGetIdentities($expected, $origData, $data, $isDeleted = fals
 
     /**
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getIdentitiesProvider()
     {
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
@@ -12,6 +12,7 @@
 
 /**
  * Class FinalPriceBoxTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase
 {
@@ -71,6 +72,9 @@ class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase
     /** @var  Manager|\PHPUnit_Framework_MockObject_MockObject */
     private $moduleManager;
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     protected function setUp()
     {
         $this->product = $this->getMock(
@@ -231,7 +235,6 @@ public function testRenderMsrpEnabled()
             ->with('Magento_Msrp')
             ->willReturn(true);
 
-
         $this->priceInfo->expects($this->once())
             ->method('getPrice')
             ->with($this->equalTo('msrp_price'))
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
@@ -12,6 +12,7 @@
 
 /**
  * Class FinalPriceBoxTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase
 {
@@ -71,6 +72,9 @@ class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase
     /** @var  Manager|\PHPUnit_Framework_MockObject_MockObject */
     private $moduleManager;
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     protected function setUp()
     {
         $this->product = $this->getMock(
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -13,7 +13,9 @@
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Framework\Exception\LocalizedException;
 
-
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Save extends \Magento\Customer\Controller\Adminhtml\Index
 {
     /**
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\GiftMessage\Test\Unit\Model;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\GiftMessage\Helper\Message as GiftMessageHelper;
 use Magento\Store\Model\ScopeInterface as Scope;
 use Magento\Customer\Model\Context as CustomerContext;
@@ -13,6 +14,7 @@
 
 /**
  * GiftMessage config provider test
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GiftMessageConfigProviderTest extends \PHPUnit_Framework_TestCase
 {
@@ -68,7 +70,7 @@ protected function setUp()
         $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class, [], [], '', false);
         $this->localeFormatMock = $this->getMock(\Magento\Framework\Locale\FormatInterface::class, [], [], '', false);
         $this->formKeyMock = $this->getMock(\Magento\Framework\Data\Form\FormKey::class, [], [], '', false);
-        $this->scopeConfigMock = $this->getMock(\Magento\Framework\App\Config\ScopeConfigInterface::class, [], [], '', false);
+        $this->scopeConfigMock = $this->getMock(ScopeConfigInterface::class, [], [], '', false);
         $contextMock = $this->getMock(\Magento\Framework\App\Helper\Context::class, [], [], '', false);
         $this->cartRepositoryMock = $this->getMock(
             \Magento\GiftMessage\Api\CartRepositoryInterface::class,
diff --git a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
@@ -55,6 +55,7 @@ class StructurePlugin
     /**
      * @param ScopeDefiner $scopeDefiner
      * @param BackendHelper $helper
+     * @param PaymentSectionModifier|null $paymentSectionModifier
      */
     public function __construct(
         ScopeDefiner $scopeDefiner,
diff --git a/app/code/Magento/Paypal/Model/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
@@ -133,7 +133,6 @@ public function getResponceValidator()
         return $this->responseValidator;
     }
 
-
     /**
      * Do not validate payment form using server methods
      *
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
@@ -168,6 +168,9 @@ private function fetchAllAvailableGroups($structure)
         return $availableGroups;
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function caseProvider()
     {
         return [
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php
@@ -33,7 +33,6 @@ protected function setUp()
 
         $this->paymentSectionModifier = $this->getMockBuilder(PaymentSectionModifier::class)->getMock();
 
-
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->_model = $objectManagerHelper->getObject(
             'Magento\Paypal\Model\Config\StructurePlugin',
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/View/Tab/HistoryTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/View/Tab/HistoryTest.php
@@ -40,7 +40,6 @@ class HistoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $contextMock;
 
-
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
diff --git a/app/code/Magento/Store/Model/Config/Processor/Fallback.php b/app/code/Magento/Store/Model/Config/Processor/Fallback.php
@@ -60,8 +60,11 @@ class Fallback implements PostProcessorInterface
     private $deploymentConfig;
 
     /**
-     * Fallback constructor.
      * @param Scopes $scopes
+     * @param ResourceConnection $resourceConnection
+     * @param Store $storeResource
+     * @param Website $websiteResource
+     * @param DeploymentConfig $deploymentConfig
      */
     public function __construct(
         Scopes $scopes,
@@ -79,6 +82,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function process(array $data)
     {
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website.php b/app/code/Magento/Store/Model/ResourceModel/Website.php
@@ -13,11 +13,6 @@
  */
 class Website extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
-    /**
-     * @var array
-     */
-    private $websitesCache;
-
     /**
      * Define main table
      *
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php
@@ -12,6 +12,7 @@
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConfigurableTest 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
@@ -79,4 +79,4 @@ private function getObjectManager()
     {
         return \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
     }
-}
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/config.php b/dev/tests/integration/testsuite/Magento/Review/_files/config.php
@@ -7,4 +7,4 @@
 $config->setScope('default');
 $config->setScopeId(0);
 $config->setValue(1);
-$config->save();
+$config->save();

Original file line number	Diff line number	Diff line change
`@@ -2616,6 +2616,7 @@ private function getMediaGalleryProcessor()`
`2616`	`2616`	`/**`
`2617`	`2617`	`* Set the associated products`
`2618`	`2618`	`* @param array $productIds`
	`2619`	`+ * @return void`
`2619`	`2620`	`*/`
`2620`	`2621`	`public function setAssociatedProductIds(array $productIds)`
`2621`	`2622`	`{`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private function isMsrpPriceApplicable()`
`93`	`93`	`{`
`94`	`94`	`$moduleManager = $this->getModuleManager();`
`95`	`95`
`96`		`- if (!$moduleManager->isEnabled('Magento_Msrp') \|\| !$moduleManager->isOutputEnabled('Magento_Msrp') ) {`
	`96`	`+ if (!$moduleManager->isEnabled('Magento_Msrp') \|\| !$moduleManager->isOutputEnabled('Magento_Msrp')) {`
`97`	`97`	`return false;`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,3 @@ public function testAddColumn()`
`45`	`45`	`$this->assertEquals($builder, $builder->addColumn('test', \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER));`
`46`	`46`	`}`
`47`	`47`	`}`
`48`		`-`
Original file line number	Diff line number	Diff line change
`@@ -656,6 +656,7 @@ public function testGetIdentities($expected, $origData, $data, $isDeleted = fals`
`656`	`656`
`657`	`657`	`/**`
`658`	`658`	`* @return array`
	`659`	`+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)`
`659`	`660`	`*/`
`660`	`661`	`public function getIdentitiesProvider()`
`661`	`662`	`{`