MAGETWO-66077: Remove usages of unserialize in module Magento/Paypal

Author: slopukhov

app/code/Magento/Paypal/Model/Report/Settlement.php

@@ -165,7 +165,7 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
 
     /**
      * Columns with DateTime data type
-     * 
+     *
      * @var array
      */
     private $dateTimeColumns = ['transaction_initiation_date', 'transaction_completion_date'];
@@ -178,15 +178,21 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
     private $amountColumns = ['gross_transaction_amount', 'fee_amount'];
 
     /**
-    * @param \Magento\Framework\Model\Context $context
-    * @param \Magento\Framework\Registry $registry
-    * @param \Magento\Framework\Filesystem $filesystem
-    * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-    * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-    * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-    * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-    * @param array $data
-    */
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
+    /**
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Filesystem $filesystem
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     */
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
@@ -195,12 +201,15 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->_tmpDirectory = $filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
         $this->_storeManager = $storeManager;
         $this->_scopeConfig = $scopeConfig;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
@@ -305,14 +314,14 @@ public function fetchAndSave(\Magento\Framework\Filesystem\Io\Sftp $connection)
     public static function createConnection(array $config)
     {
         if (!isset(
-            $config['hostname']
-        ) || !isset(
-            $config['username']
-        ) || !isset(
-            $config['password']
-        ) || !isset(
-            $config['path']
-        )
+                $config['hostname']
+            ) || !isset(
+                $config['username']
+            ) || !isset(
+                $config['password']
+            ) || !isset(
+                $config['path']
+            )
         ) {
             throw new \InvalidArgumentException('Required config elements: hostname, username, password, path');
         }
@@ -424,7 +433,7 @@ private function getBodyItems(array $line, array $sectionColumns, array $rowMap)
 
     /**
      * Format date columns in UTC
-     * 
+     *
      * @param string $lineItem
      * @return string
      */
@@ -574,10 +583,10 @@ public function getSftpCredentials($automaticMode = false)
                 $cfg['path'] = self::REPORTS_PATH;
             }
             // avoid duplicates
-            if (in_array(serialize($cfg), $uniques)) {
+            if (in_array($this->serializer->serialize($cfg), $uniques)) {
                 continue;
             }
-            $uniques[] = serialize($cfg);
+            $uniques[] = $this->serializer->serialize($cfg);
             $configs[] = $cfg;
         }
         return $configs;

dev/tests/integration/testsuite/Magento/Paypal/Model/Report/SettlementTest.php

@@ -33,6 +33,34 @@ public function testCreateConnectionException($config)
         \Magento\Paypal\Model\Report\Settlement::createConnection($config);
     }
 
+    /**
+     * @param array $automaticMode
+     * @param array $expectedResult
+     *
+     * @dataProvider createAutomaticModeDataProvider
+     *
+     * @magentoConfigFixture default_store paypal/fetch_reports/active 0
+     * @magentoConfigFixture default_store paypal/fetch_reports/ftp_ip 192.168.0.1
+     * @magentoConfigFixture current_store paypal/fetch_reports/active 1
+     * @magentoConfigFixture current_store paypal/fetch_reports/ftp_ip 127.0.0.1
+     * @magentoConfigFixture current_store paypal/fetch_reports/ftp_path /tmp
+     * @magentoConfigFixture current_store paypal/fetch_reports/ftp_login login
+     * @magentoConfigFixture current_store paypal/fetch_reports/ftp_password password
+     * @magentoConfigFixture current_store paypal/fetch_reports/ftp_sandbox 0
+     * @magentoDbIsolation enabled
+     */
+    public function testGetSftpCredentials($automaticMode, $expectedResult)
+    {
+        /** @var $model \Magento\Paypal\Model\Report\Settlement; */
+        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Paypal\Model\Report\Settlement::class
+        );
+
+        $result = $model->getSftpCredentials($automaticMode);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
     /**
      * @return array
      */
@@ -46,4 +74,37 @@ public function createConnectionExceptionDataProvider()
             [['hostname' => 'example.com', 'username' => 'test', 'password' => 'test']]
         ];
     }
+
+    /**
+     * @return array
+     */
+    public function createAutomaticModeDataProvider()
+    {
+        return [
+            [
+                true,
+                [
+                    [
+                        'hostname' => '127.0.0.1',
+                        'path' => '/tmp',
+                        'username' => 'login',
+                        'password' => 'password',
+                        'sandbox' => '0'
+                    ]
+                ]
+            ],
+            [
+                false,
+                [
+                    [
+                        'hostname' => '127.0.0.1',
+                        'path' => '/tmp',
+                        'username' => 'login',
+                        'password' => 'password',
+                        'sandbox' => '0'
+                    ]
+                ]
+            ],
+        ];
+    }
 }