Initialise Database Helper from Object Manager if not passed by DI.

Increases backwards compatability.
max-tkachuk · Apr 29, 2019 · f33b038 · f33b038
1 parent 76e74ca
commit f33b038
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -54,10 +54,10 @@ class File extends BackendFile
      * @param RequestDataInterface $requestData
      * @param Filesystem $filesystem
      * @param UrlInterface $urlBuilder
-     * @param Database $databaseHelper
      * @param AbstractResource|null $resource
      * @param AbstractDb|null $resourceCollection
      * @param array $data
+     * @param Database $databaseHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -69,10 +69,10 @@ public function __construct(
         RequestDataInterface $requestData,
         Filesystem $filesystem,
         UrlInterface $urlBuilder,
-        Database $databaseHelper,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        Database $databaseHelper = null
     ) {
         parent::__construct(
             $context,
@@ -87,7 +87,7 @@ public function __construct(
             $data
         );
         $this->urlBuilder = $urlBuilder;
-        $this->databaseHelper = $databaseHelper;
+        $this->databaseHelper = $databaseHelper ?: ObjectManager::getInstance()->get(Database::class);
     }
 
     /**