MAGETWO-87551: Convert existing data install/upgrade scripts

--fix L2

Author: Sergii Kovalenko

setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php

@@ -104,7 +104,7 @@ public function executeDataProvider()
             [
                 'options' => [
                     '--magento-init-params' => '',
-                    '--convert_old_scripts' => false
+                    '--convert_old_scripts' => false,
                 ],
                 'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
                 'expectedString' => 'Please re-run Magento compile command. Use the command "setup:di:compile"'
@@ -113,20 +113,24 @@ public function executeDataProvider()
                     'keep-generated' => false,
                     'convert_old_scripts' => false,
                     'magento-init-params' => '',
+                    'safe-mode' => false,
+                    'data-restore' => false
                 ]
             ],
             [
                 'options' => [
                     '--magento-init-params' => '',
                     '--convert_old_scripts' => false,
-                    '--keep-generated' => true
+                    '--keep-generated' => true,
                 ],
                 'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
                 'expectedString' => '',
                 'expectedOptions' => [
                     'keep-generated' => true,
                     'convert_old_scripts' => false,
                     'magento-init-params' => '',
+                    'safe-mode' => false,
+                    'data-restore' => false
                 ]
             ],
             [
@@ -137,6 +141,8 @@ public function executeDataProvider()
                     'keep-generated' => false,
                     'convert_old_scripts' => false,
                     'magento-init-params' => '',
+                    'safe-mode' => false,
+                    'data-restore' => false
                 ]
             ],
             [
@@ -147,6 +153,8 @@ public function executeDataProvider()
                     'keep-generated' => false,
                     'convert_old_scripts' => false,
                     'magento-init-params' => '',
+                    'safe-mode' => false,
+                    'data-restore' => false
                 ]
             ],
         ];

setup/src/Magento/Setup/Test/Unit/Model/Declaration/Schema/OperationsExecutorTest.php

@@ -108,6 +108,7 @@ protected function setUp()
                     'create_table' => $this->createTableOperation,
                     'drop_element' => $this->dropElement
                 ],
+                'dataSaviorsCollection' => [],
                 'sharding' => $this->shardingMock,
                 'resourceConnection' => $this->resourceConnectionMock,
                 'statementFactory' => $this->statementFactoryMock,
@@ -178,6 +179,6 @@ public function testExecute()
             ->willReturn($tablesHistories);
         $this->dropElement->expects(self::at(0))
             ->method('doOperation');
-        $this->model->execute($diff);
+        $this->model->execute($diff, []);
     }
 }