PHPCS issues

Block/Adminhtml/System/Config/Gd.php

@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Block\Adminhtml\System\Config;
 

Block/Adminhtml/System/Config/ModuleVersion.php

@@ -1,12 +1,12 @@
-<?php
-
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Block\Adminhtml\System\Config;
 
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem\Directory\ReadFactory as DirectoryReadFactory;
 use Magento\Framework\Filesystem\File\ReadFactory as FileReadFactory;
 use Magento\Framework\Module\ModuleListInterface;
@@ -115,6 +115,8 @@ public function getModuleVersion(): string
 
     /**
      * @return string
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     private function getModuleVersionFromComposer(): string
     {

Block/Adminhtml/System/Config/PhpVersion.php

@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Block\Adminhtml\System\Config;
 

Block/Picture.php

@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Block;
 

Browser/BrowserSupport.php

@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Browser;
 

CHANGELOG.md

@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Fixed
+- Add current store to all methods
 - Make sure ConvertorListing works even though no convertor is available
 
 ## [0.2.2] - 29 June 2021

Image/File.php

@@ -1,6 +1,4 @@
-<?php
-
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Image;
 
@@ -19,11 +17,6 @@ class File
      */
     private $directoryList;
 
-    /**
-     * @var DirectoryReadFactory
-     */
-    private $directoryReadFactory;
-
     /**
      * @var FileDriver
      */
@@ -43,20 +36,17 @@ class File
      * File constructor.
      *
      * @param DirectoryList $directoryList
-     * @param DirectoryReadFactory $directoryReadFactory
      * @param FileDriver $fileDriver
      * @param Debugger $debugger
      * @param FileReadFactory $fileReadFactory
      */
     public function __construct(
         DirectoryList $directoryList,
-        DirectoryReadFactory $directoryReadFactory,
         FileDriver $fileDriver,
         Debugger $debugger,
         FileReadFactory $fileReadFactory
     ) {
         $this->directoryList = $directoryList;
-        $this->directoryReadFactory = $directoryReadFactory;
         $this->fileDriver = $fileDriver;
         $this->debugger = $debugger;
         $this->fileReadFactory = $fileReadFactory;
@@ -124,12 +114,8 @@ public function uriExists(string $uri): bool
      */
     public function fileExists($filePath): bool
     {
-        try {
-            $fileRead = $this->fileReadFactory->create($filePath, 'file');
-            return (bool)$fileRead->readAll();
-        } catch (FileSystemException $fileSystemException) {
-            return false;
-        }
+        $fileRead = $this->fileReadFactory->create($filePath, 'file');
+        return (bool)$fileRead->readAll();
     }
 
     /**

Image/HtmlReplacer.php

@@ -1,17 +1,13 @@
-<?php
-
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Image;
 
-use Exception as ExceptionAlias;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\LayoutInterface;
 use Yireo\NextGenImages\Block\Picture;
 use Yireo\NextGenImages\Config\Config;
 use Yireo\NextGenImages\Convertor\ConvertorListing;
 use Yireo\NextGenImages\Exception\ConvertorException;
-use Yireo\NextGenImages\Exception\NoConversionNeededException;
 use Yireo\NextGenImages\Logger\Debugger;
 
 class HtmlReplacer
@@ -30,6 +26,7 @@ class HtmlReplacer
      * @var Config
      */
     private $config;
+
     /**
      * @var UrlInterface
      */
@@ -41,6 +38,7 @@ class HtmlReplacer
      * @param ConvertorListing $convertorListing
      * @param Debugger $debugger
      * @param Config $config
+     * @param UrlInterface $url
      */
     public function __construct(
         ConvertorListing $convertorListing,
@@ -141,7 +139,7 @@ private function getNewHtmlTag(
         $htmlTag,
         bool $isDataSrc = false
     ): string {
-        return (string)$this->getPictureBlock($layout)
+        return $this->getPictureBlock($layout)
             ->setOriginalImage($imageUrl)
             ->setSourceImages($sourceImages)
             ->setAltText($this->getAttributeText($htmlTag, 'alt'))
@@ -163,8 +161,7 @@ private function getAttributeText(string $htmlTag, string $attribute): string
     {
         if (preg_match('/\ ' . $attribute . '=\"([^\"]+)/', $htmlTag, $match)) {
             $altText = $match[1];
-            $altText = strtr($altText, ['"' => '', "'" => '']);
-            return $altText;
+            return strtr($altText, ['"' => '', "'" => '']);
         }
 
         return '';

Logger/Debugger.php

@@ -1,5 +1,4 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Logger;
 

Plugin/CorrectImagesInAjaxResponse.php

@@ -1,6 +1,4 @@
-<?php
-
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Plugin;
 

Plugin/ReplaceTagsPlugin.php

@@ -1,9 +1,7 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\NextGenImages\Plugin;
 
-use Exception as ExceptionAlias;
 use Magento\Framework\View\LayoutInterface;
 use Yireo\NextGenImages\Image\HtmlReplacer;