Merge pull request #10 from EaDesgin/feature/MLC-327-Update-eacore

MLC-327: Update Eacore
EaDesgin · Oct 1, 2020 · 15b956e · 15b956e
2 parents 36f9c05 + a090345
commit 15b956e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 133 deletions.
diff --git a/Controller/Adminhtml/Eacore.php b/Controller/Adminhtml/Eacore.php
@@ -1,49 +1,19 @@
 <?php
 
-/**
- * EaDesgin
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@eadesign.ro so we can send you a copy immediately.
- *
- * @category    eadesigndev_pdfgenerator
- * @copyright   Copyright (c) 2008-2016 EaDesign by Eco Active S.R.L.
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
+declare(strict_types=1);
 
 namespace Eadesigndev\Eacore\Controller\Adminhtml;
 
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\ActionInterface;
 
-abstract class Eacore extends \Magento\Backend\App\Action implements ActionInterface
+abstract class Eacore extends Action implements ActionInterface
 {
+    public const ADMIN_RESOURCE_VIEW = 'Eadesigndev_Eacore::index';
 
-    const ADMIN_RESOURCE_VIEW = 'Eadesigndev_Eacore::index';
-
-    /**
-     * Core registry
-     *
-     * @var \Magento\Framework\Registry
-     */
-    private $coreRegistry;
-
-    /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
-     */
-    public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Registry $coreRegistry
-    )
+    public function __construct(Context $context)
     {
-        $this->coreRegistry = $coreRegistry;
         parent::__construct($context);
     }
 

diff --git a/Controller/Adminhtml/Index/Index.php b/Controller/Adminhtml/Index/Index.php
@@ -1,65 +1,36 @@
 <?php
 
-/**
- * EaDesgin
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@eadesign.ro so we can send you a copy immediately.
- *
- * @category    eadesigndev_pdfgenerator
- * @copyright   Copyright (c) 2008-2016 EaDesign by Eco Active S.R.L.
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
+declare(strict_types=1);
 
 namespace Eadesigndev\Eacore\Controller\Adminhtml\Index;
 
+use Eadesigndev\Eacore\Controller\Adminhtml\Eacore;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Page;
 use Magento\Framework\App\ActionInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\View\Result\PageFactory;
 
-class Index extends \Eadesigndev\Eacore\Controller\Adminhtml\Eacore implements ActionInterface
+class Index extends Eacore implements ActionInterface
 {
-    private $helper;
-
-    /**
-     * @var \Magento\Framework\View\Result\PageFactory
-     */
     protected $resultPageFactory;
 
-    /**
-     * Index constructor.
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Eadesigndev\Eacore\Helper\Data $helper
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Eadesigndev\Eacore\Helper\Data $helper,
-        \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory
+        Context $context,
+        PageFactory $resultPageFactory
     ) {
-        $this->helper = $helper;
         $this->resultPageFactory = $resultPageFactory;
-        parent::__construct($context, $coreRegistry);
+        parent::__construct($context);
     }
 
     /**
      * Index action
      *
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @return ResultInterface
      */
     public function execute()
     {
-
-        $this->helper->dataSet();
-
-        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        /** @var Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $this->initPage($resultPage)->getConfig()->getTitle()->prepend(__('&nbsp;'));
         return $resultPage;

diff --git a/composer.json b/composer.json
@@ -1,40 +1,28 @@
 {
-  "name": "eadesignro/module-eacore",
-  "description": "The module with the menu and other features needed by other modules developed by EaDesign",
-  "type": "magento2-module",
-  "version": "0.2.12",
-  "autoload": {
-    "files": [
-      "registration.php"
+    "name": "eadesignro/module-eacore",
+    "description": "The module with the menu and other features needed by other modules developed by EaDesign",
+    "type": "magento2-module",
+    "version": "0.3.0",
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Eadesigndev\\Eacore\\": ""
+        }
+    },
+    "license": "Apache-2.0",
+    "authors": [
+        {
+            "name": "EaDesign",
+            "email": "office@eadesign.ro",
+            "homepage": "https://www.eadesign.ro/",
+            "role": "Developer"
+        }
     ],
-    "psr-4": {
-      "Eadesigndev\\Eacore\\": ""
+    "require": {
+        "php": "^7.2",
+        "magento/magento2-base": "^2.3",
+        "magento/module-backend": "*"
     }
-  },
-
-  "license": "Apache-2.0",
-  "authors": [
-    {
-      "name": "EaDesign",
-      "email": "office@eadesign.ro",
-      "homepage": "https://www.eadesign.ro/",
-      "role": "Developer"
-    }
-  ],
-  "require": {
-    "php": "~7.0.13 | ~7.1.3 | ~7.2.0 | ~7.3.0",
-    "magento/module-backend": "^100.1.0 | ^100.2.0 | ^101.0.0"
-  },
-  "require-dev": {
-    "friendsofphp/php-cs-fixer": "~2.13.0",
-    "lusitanian/oauth": "~0.8.10",
-    "magento/magento2-functional-testing-framework": "2.3.9",
-    "pdepend/pdepend": "2.5.2",
-    "phpmd/phpmd": "@stable",
-    "phpunit/phpunit": "~6.5.0",
-    "sebastian/phpcpd": "~3.0.0",
-    "squizlabs/php_codesniffer": "3.3.1"
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true
 }
diff --git a/etc/module.xml b/etc/module.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0"?>
-<!--
-/**
- * EaDesgin
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@eadesign.ro so we can send you a copy immediately.
- *
- * @category    eadesigndev_pdfgenerator
- * @copyright   Copyright (c) 2008-2016 EaDesign by Eco Active S.R.L.
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
+
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Eadesigndev_Eacore" setup_version="0.2.12"/>
+    <module name="Eadesigndev_Eacore" />
 </config>