MAGETWO-66331: Implement solution to update duplicate rows at once and add environment variable to control batch size

- making envBatchSize parameter optional, fixing formatting

Author: Igor Melnikov

lib/internal/Magento/Framework/DB/FieldDataConverter.php

@@ -62,13 +62,13 @@ class FieldDataConverter
      * @param Generator $queryGenerator
      * @param DataConverterInterface $dataConverter
      * @param SelectFactory|null $selectFactory
-     * @param string $envBatchSize
+     * @param string|null $envBatchSize
      */
     public function __construct(
         Generator $queryGenerator,
         DataConverterInterface $dataConverter,
         SelectFactory $selectFactory,
-        $envBatchSize
+        $envBatchSize = null
     ) {
         $this->queryGenerator = $queryGenerator;
         $this->dataConverter = $dataConverter;

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

@@ -57,11 +57,10 @@ public function __construct(
     public function get()
     {
         if (null === $this->objectManager) {
-            $initParams =
-                array_merge(
-                    $this->serviceLocator->get(InitParamListener::BOOTSTRAP_PARAM),
-                    $_SERVER
-                );
+            $initParams = array_merge(
+                $this->serviceLocator->get(InitParamListener::BOOTSTRAP_PARAM),
+                $_SERVER
+            );
             $factory = $this->getObjectManagerFactory($initParams);
             $this->objectManager = $factory->create($initParams);
             if (PHP_SAPI == 'cli') {