Merge branch 'release/3.0.0'

.gitignore

@@ -1,2 +1,4 @@
 .idea
-.DS_Store
+.DS_Store
+composer.lock
+/vendor

Block/Cache/Additional.php

@@ -1,23 +1,12 @@
 <?php
-/**
- * Additional
- *
- * @copyright Copyright (c) 2016 Staempfli AG
- * @author    juan.alonso@staempfli.com
- */
 
 namespace Staempfli\ImageResizer\Block\Cache;
 
 use Magento\Backend\Block\Cache\Additional as MagentoCacheAdditional;
 
 class Additional extends MagentoCacheAdditional
 {
-    /**
-     * Clean resized images url
-     *
-     * @return string
-     */
-    public function getCleanResizedImagesUrl()
+    public function getCleanResizedImagesUrl(): string
     {
         return $this->getUrl('staempfli_imageresizer/cache/cleanResizedImages');
     }

Controller/Adminhtml/Cache/CleanResizedImages.php

@@ -1,71 +1,61 @@
 <?php
-/**
- * CleanResizedImages
- *
- * @copyright Copyright (c) 2016 Staempfli AG
- * @author    juan.alonso@staempfli.com
- */
 
 namespace Staempfli\ImageResizer\Controller\Adminhtml\Cache;
 
+use Exception;
 use Magento\Backend\App\Action\Context;
-use Magento\Backend\Controller\Adminhtml\Cache as MagentoAdminCache;
+use Magento\Backend\Controller\Adminhtml\Cache;
 use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Framework\App\Cache\Frontend\Pool;
 use Magento\Framework\App\Cache\StateInterface;
 use Magento\Framework\App\Cache\TypeListInterface;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\View\Result\PageFactory;
 use Staempfli\ImageResizer\Model\Cache as ResizerCache;
 
-class CleanResizedImages extends MagentoAdminCache
+class CleanResizedImages extends Cache
 {
-    /**
-     * @var ResizerCache
-     */
-    protected $resizerCache;
+    protected ManagerInterface $eventManager;
+
+    protected $messageManager;
 
-    /**
-     * CleanResizedImages constructor.
-     * @param ResizerCache $resizerCache
-     * @param Context $context
-     * @param TypeListInterface $cacheTypeList
-     * @param StateInterface $cacheState
-     * @param Pool $cacheFrontendPool
-     * @param PageFactory $resultPageFactory
-     */
     public function __construct(
-        ResizerCache $resizerCache,
+        protected ResizerCache $resizerCache,
         Context $context,
         TypeListInterface $cacheTypeList,
         StateInterface $cacheState,
         Pool $cacheFrontendPool,
         PageFactory $resultPageFactory
     ) {
-        parent::__construct($context, $cacheTypeList, $cacheState, $cacheFrontendPool, $resultPageFactory);
-        $this->resizerCache = $resizerCache;
+        $this->eventManager = $context->getEventManager();
+        $this->messageManager = $context->getMessageManager();
+
+        parent::__construct(
+            $context,
+            $cacheTypeList,
+            $cacheState,
+            $cacheFrontendPool,
+            $resultPageFactory
+        );
     }
 
     /**
      * Clean JS/css files cache
-     *
-     * @return Redirect
      */
-    public function execute()
+    public function execute(): Redirect
     {
         try {
             $this->resizerCache->clearResizedImagesCache();
-            $this->_eventManager->dispatch('staempfli_imageresizer_clean_images_cache_after');
+            $this->eventManager->dispatch('staempfli_imageresizer_clean_images_cache_after');
             $this->messageManager->addSuccessMessage(__('The resized images cache was cleaned.'));
-        } catch (LocalizedException $e) {
-            $this->messageManager->addErrorMessage($e->getMessage());
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->messageManager->addExceptionMessage($e, __('An error occurred while clearing the resized images cache.'));
         }
 
         /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+
         return $resultRedirect->setPath('adminhtml/cache');
     }
 }

Model/Cache.php

@@ -1,36 +1,28 @@
 <?php
-/**
- * Cache
- *
- * @copyright Copyright (c) 2016 Staempfli AG
- * @author    juan.alonso@staempfli.com
- */
 
 namespace Staempfli\ImageResizer\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
 
 class Cache
 {
-    /**
-     * @var Filesystem\Directory\WriteInterface
-     */
-    protected $mediaDirectory;
+    protected Filesystem\Directory\WriteInterface $mediaDirectory;
 
     /**
-     * Cache constructor.
-     * @param Filesystem $filesystem
+     * @throws FileSystemException
      */
-    public function __construct(Filesystem $filesystem)
-    {
+    public function __construct(
+        Filesystem $filesystem
+    ) {
         $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
     }
 
     /**
-     * Delete Image resizer cache dir
+     * @throws FileSystemException
      */
-    public function clearResizedImagesCache()
+    public function clearResizedImagesCache(): void
     {
         $this->mediaDirectory->delete(Resizer::IMAGE_RESIZER_CACHE_DIR);
     }