[TASK] Some minor code improvements

sitegeist · Aug 16, 2024 · b24d082 · b24d082
1 parent 59eca5f
commit b24d082
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 34 deletions.
diff --git a/Classes/Command/ProcessQueueCommand.php b/Classes/Command/ProcessQueueCommand.php
@@ -1,10 +1,8 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Command;
 
-use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Driver\Exception;
 use Sitegeist\ImageJack\Runner\TemplateRunner;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;

diff --git a/Classes/EventListener/MimeTypeCacheParams.php b/Classes/EventListener/MimeTypeCacheParams.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\EventListener;
 

diff --git a/Classes/Processor/ImageJackProcessor.php b/Classes/Processor/ImageJackProcessor.php
@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Processor;
 
@@ -18,6 +18,7 @@ public function processTask(TaskInterface $task): void
         parent::processTask($task);
         $processedFile = $task->getTargetFile();
 
+        /** @var TemplateRunner $templateRunner */
         $templateRunner = GeneralUtility::makeInstance(TemplateRunner::class, $processedFile);
         $templateRunner->run();
 

diff --git a/Classes/Runner/TemplateRunner.php b/Classes/Runner/TemplateRunner.php
@@ -1,10 +1,10 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Runner;
 
-use Sitegeist\ImageJack\Utility\LoggerUtility;
 use Psr\Log\LogLevel;
+use Sitegeist\ImageJack\Utility\LoggerUtility;
 use TYPO3\CMS\Core\Resource\ProcessedFile;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 

diff --git a/Classes/Templates/AbstractTemplate.php b/Classes/Templates/AbstractTemplate.php
@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Templates;
 

diff --git a/Classes/Templates/AvifTemplate.php b/Classes/Templates/AvifTemplate.php
@@ -1,10 +1,10 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Templates;
 
-use TYPO3\CMS\Core\Imaging\GraphicalFunctions;
 use Psr\Log\LogLevel;
+use TYPO3\CMS\Core\Imaging\GraphicalFunctions;
 use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Resource\DuplicationBehavior;
 use TYPO3\CMS\Core\Utility\CommandUtility;
@@ -15,7 +15,7 @@ class AvifTemplate extends AbstractTemplate implements TemplateInterface, Conver
 {
     public function isAvailable(): bool
     {
-        return (in_array($this->image->getMimeType(), $this->getSupportedMimeTypes()) && $this->isActive());
+        return in_array($this->image->getMimeType(), $this->getSupportedMimeTypes()) && $this->isActive();
     }
 
     public function getSupportedMimeTypes(): array
@@ -74,7 +74,7 @@ public function processFile(): void
         try {
             $this->storage->addFile(
                 $targetFile,
-                $this->image->getParentFolder(), /* @phpstan-ignore-line */
+                $this->image->getParentFolder(), // @phpstan-ignore-line
                 $this->image->getName() . '.avif',
                 DuplicationBehavior::REPLACE
             );
@@ -113,20 +113,19 @@ protected function convertImageUsingGd(string $quality, string $targetFile): boo
             /** @var Typo3Version $version */
             $version = GeneralUtility::makeInstance(Typo3Version::class);
             if ($version->getMajorVersion() == 13) {
-                $graphicalFunctionsObject = GeneralUtility::makeInstance(GifBuilder::class);/* @phpstan-ignore-line */
+                $graphicalFunctionsObject = GeneralUtility::makeInstance(GifBuilder::class);// @phpstan-ignore-line
             } else {
                 $graphicalFunctionsObject = GeneralUtility::makeInstance(GraphicalFunctions::class);
             }
-            $image = $graphicalFunctionsObject->imageCreateFromFile($this->imagePath);/* @phpstan-ignore-line */
+            $image = $graphicalFunctionsObject->imageCreateFromFile($this->imagePath);// @phpstan-ignore-line
             // Convert CMYK to RGB
             if (!imageistruecolor($image)) {
                 imagepalettetotruecolor($image);
             }
 
             return imageavif($image, $targetFile, (int)$quality);
-        } else {
-            $this->logger->writeLog('Avif is not supported by your GD version', LogLevel::ERROR);
         }
+        $this->logger->writeLog('Avif is not supported by your GD version', LogLevel::ERROR);
 
         return false;
     }

diff --git a/Classes/Templates/ConverterInterface.php b/Classes/Templates/ConverterInterface.php
@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Templates;
 

diff --git a/Classes/Templates/JpegTemplate.php b/Classes/Templates/JpegTemplate.php
@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Templates;
 
@@ -11,7 +11,7 @@ class JpegTemplate extends AbstractTemplate implements TemplateInterface
 {
     public function isAvailable(): bool
     {
-        return (in_array($this->image->getMimeType(), $this->getSupportedMimeTypes()) && $this->isActive());
+        return in_array($this->image->getMimeType(), $this->getSupportedMimeTypes()) && $this->isActive();
     }
 
     public function getSupportedMimeTypes(): array
@@ -43,7 +43,7 @@ public function processFile(): void
         try {
             $this->storage->addFile(
                 $this->imagePath,
-                $this->image->getParentFolder(), /* @phpstan-ignore-line */
+                $this->image->getParentFolder(), // @phpstan-ignore-line
                 $this->image->getName(),
                 DuplicationBehavior::REPLACE
             );

diff --git a/Classes/Templates/PngTemplate.php b/Classes/Templates/PngTemplate.php
@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Templates;
 
@@ -43,7 +43,7 @@ public function processFile(): void
         try {
             $this->storage->addFile(
                 $this->imagePath,
-                $this->image->getParentFolder(), /* @phpstan-ignore-line */
+                $this->image->getParentFolder(), // @phpstan-ignore-line
                 $this->image->getName(),
                 DuplicationBehavior::REPLACE
             );

diff --git a/Classes/Templates/TemplateInterface.php b/Classes/Templates/TemplateInterface.php
@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Templates;
 

diff --git a/Classes/Templates/WebpTemplate.php b/Classes/Templates/WebpTemplate.php
@@ -1,10 +1,10 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Templates;
 
-use TYPO3\CMS\Core\Imaging\GraphicalFunctions;
 use Psr\Log\LogLevel;
+use TYPO3\CMS\Core\Imaging\GraphicalFunctions;
 use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Resource\DuplicationBehavior;
 use TYPO3\CMS\Core\Utility\CommandUtility;
@@ -15,7 +15,7 @@ class WebpTemplate extends AbstractTemplate implements TemplateInterface, Conver
 {
     public function isAvailable(): bool
     {
-        return (in_array($this->image->getMimeType(), $this->getSupportedMimeTypes()) && $this->isActive());
+        return in_array($this->image->getMimeType(), $this->getSupportedMimeTypes()) && $this->isActive();
     }
 
     public function getSupportedMimeTypes(): array
@@ -74,7 +74,7 @@ public function processFile(): void
         try {
             $this->storage->addFile(
                 $targetFile,
-                $this->image->getParentFolder(), /* @phpstan-ignore-line */
+                $this->image->getParentFolder(), // @phpstan-ignore-line
                 $this->image->getName() . '.webp',
                 DuplicationBehavior::REPLACE
             );
@@ -112,20 +112,19 @@ protected function convertImageUsingGd(string $quality, string $targetFile): boo
         if (function_exists('imagewebp') && defined('IMG_WEBP') && (imagetypes() & IMG_WEBP) === IMG_WEBP) {
             $version = GeneralUtility::makeInstance(Typo3Version::class);
             if ($version->getMajorVersion() == 13) {
-                $graphicalFunctionsObject = GeneralUtility::makeInstance(GifBuilder::class);/* @phpstan-ignore-line */
+                $graphicalFunctionsObject = GeneralUtility::makeInstance(GifBuilder::class);// @phpstan-ignore-line
             } else {
                 $graphicalFunctionsObject = GeneralUtility::makeInstance(GraphicalFunctions::class);
             }
-            $image = $graphicalFunctionsObject->imageCreateFromFile($this->imagePath);/* @phpstan-ignore-line */
+            $image = $graphicalFunctionsObject->imageCreateFromFile($this->imagePath);// @phpstan-ignore-line
             // Convert CMYK to RGB
             if (!imageistruecolor($image)) {
                 imagepalettetotruecolor($image);
             }
 
             return imagewebp($image, $targetFile, (int)$quality);
-        } else {
-            $this->logger->writeLog('Webp is not supported by your GD version', LogLevel::ERROR);
         }
+        $this->logger->writeLog('Webp is not supported by your GD version', LogLevel::ERROR);
 
         return false;
     }

diff --git a/Classes/Utility/LoggerUtility.php b/Classes/Utility/LoggerUtility.php
@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Sitegeist\ImageJack\Utility;
 
@@ -59,7 +59,6 @@ public function __construct($logLevel = 'info')
      *
      * @param string $message
      * @param string $level
-     * @return void
      */
     public function writeLog(string $message, string $level): void
     {

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -2,10 +2,10 @@
 
 use Psr\Log\LogLevel;
 use Sitegeist\ImageJack\Hook\TsfeHook;
+use Sitegeist\ImageJack\Templates\AvifTemplate;
 use Sitegeist\ImageJack\Templates\JpegTemplate;
 use Sitegeist\ImageJack\Templates\PngTemplate;
 use Sitegeist\ImageJack\Templates\WebpTemplate;
-use Sitegeist\ImageJack\Templates\AvifTemplate;
 use Sitegeist\ImageJack\Xclass\AmazonS3Driver;
 use Sitegeist\ImageJack\Xclass\LocalDriver;
 use TYPO3\CMS\Core\Information\Typo3Version;