feat: Ajuste boas praticas Magento e menu de configurações no admin

Block/Adminhtml/System/Config/Form/Field/ColorPicker.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Gg2\ToastMessage\Block\Adminhtml\System\Config\Form\Field;
 

Block/Message.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Gg2\ToastMessage\Block;
 
@@ -13,16 +14,7 @@
 class Message extends Messages
 {
     const MAGENTO_DEFAULT_TEMPLATE = 'Magento_Theme::messages.phtml';
-
-    /**
-     * @var Settings
-     */
-    protected $settings;
-
-    /**
-     * @var ManagerInterface
-     */
-    protected $messageManager;
+    protected Settings $settings;
 
     public function __construct(
         Context $context,

Helper/Data.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Gg2\ToastMessage\Helper;
 
@@ -14,7 +15,6 @@ class Data extends AbstractHelper
     const TYPE_INFO = 'info';
 
     const XML_PATH_ACTIVE = 'gg2_toast/%s/active';
-    const XML_PATH_REMOVECOOKIEAFTER = 'gg2_toast/%s/removeCookieAfter';
     const XML_PATH_POSITION = 'gg2_toast/%s/position';
     const XML_PATH_BGCOLOR = 'gg2_toast/%s/bgColor';
     const XML_PATH_ICON = 'gg2_toast/%s/icon';

Model/Config/Source/Icon.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Gg2\ToastMessage\Model\Config\Source;
 

Model/Config/Source/Position.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Gg2\ToastMessage\Model\Config\Source;
 

Model/Config/Source/TextAlignment.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Gg2\ToastMessage\Model\Config\Source;
 

Model/Config/Source/Transition.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Gg2\ToastMessage\Model\Config\Source;
 

Observer/ClearMessages.php

@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+namespace Gg2\ToastMessage\Observer;
+
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Message\Session;
+use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Framework\Stdlib\Cookie\FailureToSendException;
+
+/**
+ * Class ClearMessages
+ * @package Gg2\ToastMessage\Observer
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class ClearMessages implements ObserverInterface
+{
+    protected Session $session;
+    protected CookieManagerInterface $cookieManager;
+
+    /**
+     * ClearMessages constructor.
+     * @param Session $session
+     * @param CookieManagerInterface $cookieManager
+     */
+    public function __construct(
+        Session $session,
+        CookieManagerInterface $cookieManager
+    )
+    {
+        $this->session = $session;
+        $this->cookieManager = $cookieManager;
+    }
+
+    /**
+     * @param Observer $observer
+     * @throws InputException
+     * @throws FailureToSendException
+     * @SuppressWarnings("unused")
+     */
+    public function execute(Observer $observer)
+    {
+        $messages = $this->session->getData('default');
+        if ($messages && !empty($messages->getItems())) {
+            $messages->clear();
+            $this->cookieManager->deleteCookie('mage-messages');
+        }
+    }
+}

Plugin/AdditionalConfig/AdditionalConfigProvider.php

@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+namespace Gg2\ToastMessage\Plugin\AdditionalConfig;
+
+use Gg2\ToastMessage\ViewModel\Settings;
+
+class AdditionalConfigProvider
+{
+    private Settings $settings;
+
+    /**
+     * AdditionalConfigProvider constructor.
+     * @param Settings $settings
+     */
+    public function __construct(Settings $settings)
+    {
+        $this->settings = $settings;
+    }
+
+    /**
+     * @param \Magento\Checkout\Model\DefaultConfigProvider $subject
+     * @param $output
+     * @return array
+     * @SuppressWarnings("unused")
+     */
+    public function afterGetConfig(
+        \Magento\Checkout\Model\DefaultConfigProvider $subject,
+        $output
+    ): array {
+        $output['toastMessageSettings']  = $this->settings->getSettings();
+        return $output;
+    }
+}

README.md

@@ -12,7 +12,7 @@ Requisitos
 ----------
 ---
  - [Magento] Community 2.3+
- - [PHP] 7.3+
+ - [PHP] 7.4+
 
 
 Instalação
@@ -70,6 +70,10 @@ Changelog
 1.1.4
 - Ajuste boas praticas magento
 
+1.1.5
+- Ajuste boas praticas magento  
+- Ajuste menu de configuracoes no admin
+
 Contribuições
 -------------
 ---

Test/Unit/Block/Adminhtml/System/Config/ColorPickerTest.php

@@ -28,7 +28,7 @@ class ColorPickerTest extends TestCase
      *
      * @return void
      */
-    public function setUp(): void
+    protected function setUp() : void
     {
         $this->elementMock = $this->getMockBuilder(AbstractElement::class)
             ->disableOriginalConstructor()
@@ -74,6 +74,6 @@ public function testRender()
 
         $expected = 'let $el = $("#' . $htmlId . '");';
         $render = $this->object->render($this->elementMock);
-        $this->assertContains($expected, $render);
+        $this->assertStringContainsString($expected, $render);
     }
 }

Test/Unit/Block/MessageTest.php

@@ -26,7 +26,7 @@ class MessageTest extends TestCase
      *
      * @return void
      */
-    public function setUp(): void
+    protected function setUp() : void
     {
         $context = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()

Test/Unit/Helper/DataTest.php

@@ -29,7 +29,7 @@ class DataTest extends TestCase
      *
      * @return void
      */
-    public function setUp(): void
+    protected function setUp() : void
     {
         $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
             ->setMethods(['getValue'])

Test/Unit/Model/Config/Source/IconTest.php

@@ -22,7 +22,7 @@ class IconTest extends TestCase
      *
      * @return void
      */
-    public function setUp(): void
+    protected function setUp() : void
     {
         $this->object = new Icon();
     }

Test/Unit/Model/Config/Source/PositionTest.php

@@ -22,7 +22,7 @@ class PositionTest extends TestCase
      *
      * @return void
      */
-    public function setUp(): void
+    protected function setUp() : void
     {
         $this->object = new Position();
     }

Test/Unit/Model/Config/Source/TextAlignmentTest.php

@@ -22,7 +22,7 @@ class TextAlignmentTest extends TestCase
      *
      * @return void
      */
-    public function setUp(): void
+    protected function setUp() : void
     {
         $this->object = new TextAlignment();
     }

Test/Unit/Model/Config/Source/TransitionTest.php

@@ -22,7 +22,7 @@ class TransitionTest extends TestCase
      *
      * @return void
      */
-    public function setUp(): void
+    protected function setUp() : void
     {
         $this->object = new Transition();
     }