MAGETWO-66100: Remove usages of unserialize in module Magento/Setup

Author: slopukhov

setup/src/Magento/Setup/Model/AdminAccount.php

@@ -11,8 +11,6 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Setup\Module\Setup;
-use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\App\ObjectManager;
 
 class AdminAccount
 {
@@ -45,31 +43,21 @@ class AdminAccount
      */
     private $encryptor;
 
-    /**
-     * Used for serialize/unserialize data.
-     *
-     * @var Json
-     */
-    private $serializer;
-
     /**
      * Default Constructor
      *
      * @param Setup $setup
      * @param EncryptorInterface $encryptor
      * @param array $data
-     * @param Json|null $serializer
      */
     public function __construct(
         Setup $setup,
         EncryptorInterface $encryptor,
-        array $data,
-        Json $serializer = null
+        array $data
     ) {
         $this->setup  = $setup;
         $this->encryptor = $encryptor;
         $this->data = $data;
-        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
     }
 
     /**
@@ -131,7 +119,6 @@ private function saveAdminUser()
             // User does not exist, create it
             $adminData['username'] = $this->data[self::KEY_USER];
             $adminData['email'] = $this->data[self::KEY_EMAIL];
-            $adminData['extra'] = $this->serializer->serialize(null);
             $this->setup->getConnection()->insert(
                 $this->setup->getTable('admin_user'),
                 $adminData

setup/src/Magento/Setup/Model/AdminAccountFactory.php

@@ -35,8 +35,7 @@ public function create(Setup $setup, $data)
         return new AdminAccount(
             $setup,
             $this->serviceLocator->get(\Magento\Framework\Encryption\Encryptor::class),
-            $data,
-            new Json()
+            $data
         );
     }
 }

setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/ArgumentsSerialization.php

@@ -9,12 +9,13 @@
 use Magento\Setup\Module\Di\Compiler\Config\ModificationInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Used for argument's array serialization and store to the DI configuration.
  *
- * @deprecated We don't need anymore serialize arguments, this class will be removed in the next
- *             backward incompatible release.
+ * @deprecated Di arguments are now stored in raw php format and could be cached by OPcache,
+ *             this class will be removed in the next backward incompatible release.
  */
 class ArgumentsSerialization implements ModificationInterface
 {