Merge pull request #444 from magefan/6984-update-notification-issue

Fix update notification

Author: magefan

Block/Adminhtml/System/Config/Form/UpdateInfo.php

@@ -8,8 +8,8 @@
 
 namespace Magefan\Blog\Block\Adminhtml\System\Config\Form;
 
-use Magento\Framework\Module\ModuleListInterface;
 use Magefan\Blog\Model\AdminNotificationFeed;
+use Magefan\Community\Api\GetModuleVersionInterface;
 
 /**
  * Class Update Info Block
@@ -24,11 +24,6 @@ class UpdateInfo extends \Magento\Backend\Block\Template
      */
     protected $curlClient;
 
-    /**
-     * @var ModuleListInterface
-     */
-    protected $moduleList;
-
     /**
      * @var mixed
      */
@@ -49,28 +44,40 @@ class UpdateInfo extends \Magento\Backend\Block\Template
      */
     protected $cacheManager;
 
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
+    /**
+     * @var GetModuleVersionInterface
+     */
+    private $getModuleVersion;
+
     /**
      * UpdateInfo constructor.
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\HTTP\Client\Curl $curl
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param AdminNotificationFeed $adminNotificationFeed
-     * @param ModuleListInterface $moduleList
      * @param array $data
+     * @param GetModuleVersionInterface|null $getModuleVersion
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\HTTP\Client\Curl $curl,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
         AdminNotificationFeed $adminNotificationFeed,
-        ModuleListInterface $moduleList,
-        array $data = []
+        array $data = [],
+        GetModuleVersionInterface $getModuleVersion = null
     ) {
         $this->cacheManager = $context->getCache();
         $this->adminNotificationFeed = $adminNotificationFeed;
-        $this->moduleList = $moduleList;
         $this->jsonHelper = $jsonHelper;
         $this->curlClient = $curl;
+        $this->getModuleVersion = $getModuleVersion ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magefan\Community\Api\GetModuleVersionInterface::class
+        );
         parent::__construct($context, $data);
     }
 
@@ -80,8 +87,7 @@ public function __construct(
     public function getCurrentVersion()
     {
         if (null === $this->currentVersion) {
-            $this->currentVersion = $this->moduleList
-                ->getOne($this->getModuleName())['setup_version'];
+            $this->currentVersion = $this->getModuleVersion->execute($this->getModuleName());
         }
 
         return $this->currentVersion;