Merge pull request #7246 from magento-gl/revert-28-AC-1077

Revert "AC-1077::Unable to pass data argument by di.xml for block ins…

Author: sidolov

lib/internal/Magento/Framework/View/Element/BlockFactory.php

@@ -6,8 +6,6 @@
 namespace Magento\Framework\View\Element;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\ObjectManager\ConfigInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Creates Blocks
@@ -22,25 +20,14 @@ class BlockFactory
      */
     protected $objectManager;
 
-    /**
-     * Object manager config
-     *
-     * @var ConfigInterface
-     */
-    private $config;
-
     /**
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
-     * @param ConfigInterface $config
      */
-    public function __construct(
-        ObjectManagerInterface $objectManager,
-        ?ConfigInterface $config = null
-    ) {
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
         $this->objectManager = $objectManager;
-        $this->config        = $config ?: ObjectManager::getInstance()->get(ConfigInterface::class);
     }
 
     /**
@@ -53,9 +40,8 @@ public function __construct(
      */
     public function createBlock($blockName, array $arguments = [])
     {
-        $blockName  = ltrim($blockName, '\\');
-        $arguments  = $this->getConfigArguments($blockName, $arguments);
-        $block      = $this->objectManager->create($blockName, $arguments);
+        $blockName = ltrim($blockName, '\\');
+        $block = $this->objectManager->create($blockName, $arguments);
         if (!$block instanceof BlockInterface) {
             throw new \LogicException($blockName . ' does not implement BlockInterface');
         }
@@ -64,24 +50,4 @@ public function createBlock($blockName, array $arguments = [])
         }
         return $block;
     }
-
-    /**
-     * Get All Config Arguments based on Block Name
-     *
-     * @param string $blockName
-     * @param array $arguments
-     * @return array $arguments
-     */
-    private function getConfigArguments($blockName, array $arguments = [])
-    {
-        if (!$this->config) {
-            return $arguments;
-        }
-        $configArguments    = $this->config->getArguments($blockName);
-        if ($configArguments && isset($configArguments['data'])) {
-            $arguments['data'] = ($arguments && isset($arguments['data'])) ?
-                array_merge($arguments['data'], $configArguments['data']) : $configArguments['data'];
-        }
-        return $arguments;
-    }
 }