Merge pull request #756 from magento-south/MAGETWO-63171

[SOUTH] MAGETWO-63171: Update Magento Zend Framework 1 to latest version
- MAGETWO-63171 Fix Zend Mail vulnerability - for 2.1.x
- MAGETWO-63329 Travis build is red for 2.1

Author: slavvka

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)
     {

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,

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;
         }
 

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));
     }
 }
-

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()
     {

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'))

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(

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
 {
     /**

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,

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,