Update composer to support Magento 2.3.x

magepal · Mar 27, 2019 · 766656a · 766656a
1 parent 554ecd8
commit 766656a
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 112 deletions.
diff --git a/Block/Adminhtml/System/Config/TestButton.php b/Block/Adminhtml/System/Config/TestButton.php
@@ -48,7 +48,7 @@ protected function _construct()
     public function getButtonHtml()
     {
         $button = $this->getLayout()->createBlock(
-            'Magento\Backend\Block\Widget\Button'
+            \Magento\Backend\Block\Widget\Button::class
         )->setData(
             [
                 'id' => 'gmailsmtpapp_debug_result_button',
@@ -62,15 +62,17 @@ public function getButtonHtml()
 
     public function getAdminUrl()
     {
-        return $this->_urlBuilder->getUrl('magepalsmtp/test', ['store' => $this->_request->getParam('store')]);
+        return $this->_urlBuilder->getUrl(
+            'magepalsmtp/testemail',
+            ['store' => $this->_request->getParam('store')]
+        );
     }
 
     /**
      * Render button
      *
      * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {

diff --git a/Controller/Adminhtml/Test/Index.php → Controller/Adminhtml/Testemail/Index.php b/Controller/Adminhtml/Test/Index.php → Controller/Adminhtml/Testemail/Index.php
@@ -5,7 +5,7 @@
  * http://www.magepal.com | support@magepal.com
  */
 
-namespace MagePal\GmailSmtpApp\Controller\Adminhtml\Test;
+namespace MagePal\GmailSmtpApp\Controller\Adminhtml\Testemail;
 
 use Magento\Backend\App\Action;
 use Magento\Framework\Controller\ResultFactory;

diff --git a/composer.json b/composer.json
@@ -11,15 +11,17 @@
         "magento2 smtp",
         "magento2 email setup",
         "send email magento2",
-        "g suite"
+        "g suite",
+        "how to configure magento email",
+        "how to setup email magento2"
     ],
     "require": {
         "php": "~5.6.0|7.0.2|7.0.4|~7.0.6|~7.1.0|~7.1.3|~7.2.0",
         "magento/module-backend": "100.0.*|100.1.*|100.2.*|101.0.*",
         "magento/framework": "100.0.*|100.1.*|101.0.*|102.0.*"
     },
     "type": "magento2-module",
-    "version": "2.6.1",
+    "version": "2.6.2",
     "license": [
         "proprietary"
     ],

diff --git a/view/adminhtml/email/magento_email_test.html b/view/adminhtml/email/magento_email_test.html
diff --git a/view/adminhtml/email/zend_email_test.html b/view/adminhtml/email/zend_email_test.html
diff --git a/...minhtml/layout/magepalsmtp_test_index.xml → ...ml/layout/magepalsmtp_testemail_index.xml b/...minhtml/layout/magepalsmtp_test_index.xml → ...ml/layout/magepalsmtp_testemail_index.xml
diff --git a/view/adminhtml/templates/test/email.phtml b/view/adminhtml/templates/test/email.phtml
@@ -2,11 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
- */
-
-/**
- * @var $block MagePal\GmailSmtpApp\Block\Adminhtml\EmailTest
+ * https://www.magepal.com | support@magepal.com
  */
 ?>
 
@@ -88,15 +84,17 @@
 </style>
 <![endif]-->
 
+<?php /** @var $block MagePal\GmailSmtpApp\Block\Adminhtml\EmailTest  */ ?>
+
 <?php foreach ($block->verify() as $result) : ?>
     <?php if ($result['has_error'] === false) : ?>
         <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
             <circle class="path circle" fill="none" stroke="#73AF55" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/>
             <polyline class="path check" fill="none" stroke="#73AF55" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/>
         </svg>
         <p class="success">Oh Yeah!</p>
-        <p><?php echo $result['msg'] ?></p>
-        <p class="external-link">Thanks for choosing MagePal Extensions.</p>
+        <p><?php echo $result['msg'] ?></p>`
+        <p class="external-link">Discover other great extensions at <a href="http://bit.ly/mpesmptwk" target="_blank">www.magepal.com</a>.</p>
     <?php else : ?>
         <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
             <circle class="path circle" fill="none" stroke="#D06079" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/>