From d7d6c5bbe45d12df5f2cc59345d750c0db33fa80 Mon Sep 17 00:00:00 2001
From: Renon Stewart <s.renon@gmail.com>
Date: Sat, 7 Oct 2017 22:36:43 -0400
Subject: [PATCH] Add support for 2.2

---
 .../System/Config/Form/Composer/Version.php   | 121 ++++++++++++++++++
 .../Config/{ => Form/Module}/Version.php      |   4 +-
 composer.json                                 |   4 +-
 etc/adminhtml/system.xml                      |  17 ++-
 4 files changed, 137 insertions(+), 9 deletions(-)
 create mode 100644 Block/Adminhtml/System/Config/Form/Composer/Version.php
 rename Block/Adminhtml/System/Config/{ => Form/Module}/Version.php (93%)

diff --git a/Block/Adminhtml/System/Config/Form/Composer/Version.php b/Block/Adminhtml/System/Config/Form/Composer/Version.php
new file mode 100644
index 0000000..158b30f
--- /dev/null
+++ b/Block/Adminhtml/System/Config/Form/Composer/Version.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © 2017 MagePal LLC. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace MagePal\CatalogLazyLoad\Block\Adminhtml\System\Config\Form\Composer;
+
+class Version extends \Magento\Config\Block\System\Config\Form\Field
+{
+
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig
+     */
+    protected $deploymentConfig;
+
+    /**
+     * @var \Magento\Framework\Component\ComponentRegistrarInterface
+     */
+    protected $componentRegistrar;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\ReadFactory
+     */
+    protected $readFactory;
+
+    /**
+     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
+     * @param \Magento\Framework\Component\ComponentRegistrarInterface $componentRegistrar
+     * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\App\DeploymentConfig $deploymentConfig,
+        \Magento\Framework\Component\ComponentRegistrarInterface $componentRegistrar,
+        \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
+        array $data = []
+    ) {
+        $this->deploymentConfig = $deploymentConfig;
+        $this->componentRegistrar = $componentRegistrar;
+        $this->readFactory = $readFactory;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Render button
+     *
+     * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        // Remove scope label
+        $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+        return parent::render($element);
+    }
+
+
+    /**
+     * Return element html
+     *
+     * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        return 'v' . $this->getVersion();
+    }
+
+
+    /**
+     * Get Module version number
+     *
+     * @return string
+     */
+    public function getVersion(){
+        return $this->getComposerVersion($this->getModuleName());
+    }
+
+    /**
+     * @return string
+     */
+    public function getModuleName()
+    {
+        $classArray = explode('\\', get_class($this));
+
+        return count($classArray) > 2 ? "{$classArray[0]}_{$classArray[1]}" : '';
+    }
+
+    /**
+     * Get module composer version
+     *
+     * @param $moduleName
+     * @return \Magento\Framework\Phrase|string|void
+     */
+    public function getComposerVersion($moduleName)
+    {
+        $path = $this->componentRegistrar->getPath(
+            \Magento\Framework\Component\ComponentRegistrar::MODULE,
+            $moduleName
+        );
+
+        try{
+            $directoryRead = $this->readFactory->create($path);
+            $composerJsonData = $directoryRead->readFile('composer.json');
+
+            if($composerJsonData){
+                $data = json_decode($composerJsonData);
+                return !empty($data->version) ? $data->version : __('Unknown');
+            }
+
+        }
+        catch (\Exception $e){
+            //
+        }
+
+        return 'Unknown';
+
+    }
+}
diff --git a/Block/Adminhtml/System/Config/Version.php b/Block/Adminhtml/System/Config/Form/Module/Version.php
similarity index 93%
rename from Block/Adminhtml/System/Config/Version.php
rename to Block/Adminhtml/System/Config/Form/Module/Version.php
index 343dcce..41e39f8 100644
--- a/Block/Adminhtml/System/Config/Version.php
+++ b/Block/Adminhtml/System/Config/Form/Module/Version.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Copyright © 2016 MagePal. All rights reserved.
+ * Copyright © 2017 MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-namespace MagePal\CatalogLazyLoad\Block\Adminhtml\System\Config;
+namespace MagePal\CatalogLazyLoad\Block\Adminhtml\System\Config\Form\Module;
 
 class Version extends \Magento\Config\Block\System\Config\Form\Field
 {
diff --git a/composer.json b/composer.json
index d623042..1b10618 100644
--- a/composer.json
+++ b/composer.json
@@ -8,10 +8,10 @@
     "require": {
         "php": "~5.6.0|7.0.2|7.0.4|~7.0.6|~7.1.0",
         "magento/module-backend": "100.0.*|100.1.*|100.2.*",
-        "magento/framework": "100.0.*|100.1.*|100.2.*"
+        "magento/framework": "100.0.*|100.1.*|101.0.*"
     },
     "type": "magento2-module",
-    "version": "1.4.2",
+    "version": "1.5.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 19f3f34..5d619f7 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -14,12 +14,19 @@
             <label>Catalog Lazy Load</label>
             <tab>magepal</tab>
             <resource>MagePal_CatalogLazyLoad::cataloglazyload</resource>
-            <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Catalog Lazy Load Image</label>
-                <field id="version" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Version</label>
-                    <frontend_model>MagePal\CatalogLazyLoad\Block\Adminhtml\System\Config\Version</frontend_model>
+            <group id="about" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="0" translate="label">
+                <label>About MagePal Catalog Lazy Load Image</label>
+                <field id="module_version" translate="label" type="label" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Module Version</label>
+                    <frontend_model>MagePal\CatalogLazyLoad\Block\Adminhtml\System\Config\Form\Module\Version</frontend_model>
+                </field>
+                <field id="composer_version" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Composer Version</label>
+                    <frontend_model>MagePal\CatalogLazyLoad\Block\Adminhtml\System\Config\Form\Composer\Version</frontend_model>
                 </field>
+            </group>
+            <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Catalog Lazy Load Setting</label>
                 <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>