Merge branch 'master' into CLI-COMMAND

mcspronko · Nov 29, 2020 · d5dcb2a · d5dcb2a
2 parents 08296c9 + 6832b13
commit d5dcb2a
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 34 deletions.
diff --git a/Controller/Adminhtml/Cache/FlushInvalidated.php b/Controller/Adminhtml/Cache/FlushInvalidated.php
@@ -102,6 +102,6 @@ public function execute()
         }
 
         $resultRedirect = $this->resultRedirectFactory->create();
-        return $resultRedirect->setPath('adminhtml/cache');
+        return $resultRedirect->setPath($this->_redirect->getRefererUrl());
     }
 }
diff --git a/Plugin/CacheOutdatedMessagePlugin.php b/Plugin/CacheOutdatedMessagePlugin.php
@@ -3,17 +3,15 @@
  * Copyright © Pronko Consulting (https://www.pronkoconsulting.com)
  * See LICENSE for the license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pronko\SelectiveCache\Plugin;
 
 use Magento\AdminNotification\Model\System\Message\CacheOutdated;
 use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Escaper;
 use Magento\Framework\UrlInterface;
 
-/**
- * Class OutdatedCacheMessagePlugin
- */
 class CacheOutdatedMessagePlugin
 {
     /**
@@ -27,33 +25,45 @@ class CacheOutdatedMessagePlugin
     private $authorization;
 
     /**
-     * OutdatedCacheMessagePlugin constructor.
-     *
-     * @param UrlInterface           $urlBuilder
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * CacheOutdatedMessagePlugin constructor.
+     * @param UrlInterface $urlBuilder
      * @param AuthorizationInterface $authorization
+     * @param Escaper $escaper
      */
     public function __construct(
         UrlInterface $urlBuilder,
-        AuthorizationInterface $authorization
+        AuthorizationInterface $authorization,
+        Escaper $escaper
     ) {
         $this->urlBuilder = $urlBuilder;
         $this->authorization = $authorization;
+        $this->escaper = $escaper;
     }
 
     /**
      * @param CacheOutdated $subject
      * @param string        $result
-     *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetText(CacheOutdated $subject, string $result)
     {
         if ($this->authorization->isAllowed('Pronko_SelectiveCache::flush_invalidated_cache')) {
-            $result .= __(
-                '<br /> Additionally you can <a href="%1">Flush Invalidated Cache</a> directly',
-                $this->getFlushInvalidatedOnlyUrl()
+            $link = sprintf(
+                '<a href="%s">%s</a>',
+                $this->getFlushInvalidatedOnlyUrl(),
+                $this->escaper->escapeHtml(__('Flush Invalidated Cache'))
             );
+
+            $result .= '<br />' . $this->escaper->escapeHtml(__(
+                'Additionally you can %1 directly.',
+                $link
+            ), ['a']);
         }
 
         return $result;
@@ -62,7 +72,7 @@ public function afterGetText(CacheOutdated $subject, string $result)
     /**
      * @return string
      */
-    private function getFlushInvalidatedOnlyUrl()
+    private function getFlushInvalidatedOnlyUrl(): string
     {
         return $this->urlBuilder->getUrl('pronko_selectivecache/cache/flushInvalidated');
     }

diff --git a/Plugin/CachePlugin.php b/Plugin/CachePlugin.php
@@ -25,17 +25,16 @@ class CachePlugin
     /**
      * @var AuthorizationInterface
      */
-    private $_authorization;
+    private $authorization;
 
     /**
      * CachePlugin constructor.
-     *
      * @param CacheButton $cacheButton
      * @param AuthorizationInterface $authorization
      */
     public function __construct(CacheButton $cacheButton, AuthorizationInterface $authorization)
     {
-        $this->_authorization = $authorization;
+        $this->authorization = $authorization;
         $this->cacheButton = $cacheButton;
     }
 
@@ -44,11 +43,9 @@ public function __construct(CacheButton $cacheButton, AuthorizationInterface $au
      * @param LayoutInterface $layout
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSetLayout(
-        Cache $subject,
-        LayoutInterface $layout
-    ) {
-        if($this->_authorization->isAllowed('Pronko_SelectiveCache::flush_invalidated_cache')) {
+    public function beforeSetLayout(Cache $subject, LayoutInterface $layout)
+    {
+        if ($this->authorization->isAllowed('Pronko_SelectiveCache::flush_invalidated_cache')) {
             $this->cacheButton->execute($subject);
         }
     }

diff --git a/README.md b/README.md
@@ -35,3 +35,7 @@ modman clone git@github.com:mcspronko/selective-cache.git
 
 * Peter Herrmann
 * Harshvardhan Malpani
+* Serhii Koval
+* Antonis Galanis
+* Arshad Syed
+* Andresa Martins
diff --git a/Service/CacheButton.php b/Service/CacheButton.php
@@ -8,6 +8,7 @@
 namespace Pronko\SelectiveCache\Service;
 
 use Magento\Backend\Block\Cache;
+use Magento\Framework\Escaper;
 use Magento\Framework\UrlInterface;
 
 /**
@@ -20,25 +21,34 @@ class CacheButton
      */
     private $url;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * CacheButton constructor.
      * @param UrlInterface $url
+     * @param Escaper $escaper
      */
-    public function __construct(UrlInterface $url)
-    {
+    public function __construct(
+        UrlInterface $url,
+        Escaper $escaper
+    ) {
         $this->url = $url;
+        $this->escaper = $escaper;
     }
 
     /**
      * @param Cache $cache
      */
-    public function execute(Cache $cache)
+    public function execute(Cache $cache): void
     {
         $cache->addButton(
             'refresh_invalidated_cache',
             [
-                'label' => __('Refresh Invalidated Cache'),
-                'onclick' => 'setLocation(\'' . $this->getFlushInvalidatedOnlyUrl() . '\')',
+                'label' => $this->escaper->escapeHtml(__('Refresh Invalidated Cache')),
+                'onclick' => sprintf("setLocation('%s')", $this->getFlushInvalidatedOnlyUrl()),
                 'class' => 'primary flush-cache-magento'
             ]
         );
@@ -47,8 +57,10 @@ public function execute(Cache $cache)
     /**
      * @return string
      */
-    private function getFlushInvalidatedOnlyUrl()
+    private function getFlushInvalidatedOnlyUrl(): string
     {
-        return $this->url->getUrl('pronko_selectivecache/*/flushInvalidated');
+        return $this->escaper->escapeUrl(
+            $this->url->getUrl('pronko_selectivecache/*/flushInvalidated')
+        );
     }
 }
diff --git a/Test/Unit/Plugin/CachePluginTest.php b/Test/Unit/Plugin/CachePluginTest.php
@@ -7,6 +7,7 @@
 
 namespace Pronko\SelectiveCache\Test\Unit\Plugin;
 
+use Magento\Framework\AuthorizationInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\View\LayoutInterface;
@@ -39,6 +40,11 @@ class CachePluginTest extends TestCase
      */
     private $layout;
 
+    /**
+     * @var AuthorizationInterface|MockObject
+     */
+    private $authorization;
+
     protected function setUp()
     {
         $this->cacheButton = $this->getMockBuilder(CacheButton::class)
@@ -53,7 +59,15 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->object = new CachePlugin($this->cacheButton);
+        $this->authorization = $this->getMockBuilder(AuthorizationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->authorization->method('isAllowed')
+            ->with('Pronko_SelectiveCache::flush_invalidated_cache')
+            ->willReturn(true);
+
+        $this->object = new CachePlugin($this->cacheButton, $this->authorization);
     }
 
     public function testBeforeSetLayout()

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "pronko/selective-cache",
   "description": "Selective Cache extension for Magento 2",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "type": "magento2-module",
   "license": "MIT",
   "authors": [
@@ -17,8 +17,8 @@
     }
   },
   "require": {
-    "magento/framework": "101.0.*|102.0.*",
-    "magento/module-backend": "100.2.*|101.0.*"
+    "magento/framework": "~101|~102|~103",
+    "magento/module-backend": "~100|~101|~102"
   },
   "require-dev": {
     "phpunit/phpunit": "~6.5",

diff --git a/i18n/en_US.csv b/i18n/en_US.csv
@@ -1,4 +1,6 @@
 "The following cache types have been successfully cleaned: %1","The following cache types have been successfully cleaned: %1"
 "There are no invalidated cache types to be cleaned.","There are no invalidated cache types to be cleaned."
 "Refresh Invalidated Cache","Refresh Invalidated Cache"
-"<br /> Additionally you can <a href=""%1"">Flush Invalidated Cache</a> directly","<br /> Additionally you can <a href=""%1"">Flush Invalidated Cache</a> directly"
+"Additionally you can %1 directly.","Additionally you can %1 directly."
+"Refresh Invalidated Cache","Refresh Invalidated Cache"
+"Flush Invalided Cache","Flush Invalided Cache"