Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.cs.php
#	.github/workflows/build.yml
#	README.md
#	composer.json
#	phpstan.neon
#	src/Detector/JpegDetector.php
#	src/Detector/PbmDetector.php
#	src/Detector/PsdDetector.php
#	tests/ImageTypeDetectorTest.php

.gitattributes

@@ -15,6 +15,7 @@
 /tests              export-ignore
 /build              export-ignore
 /docs               export-ignore
+/.github            export-ignore
 /build.xml          export-ignore
 /phpunit.xml        export-ignore
 /.gitattributes     export-ignore

src/Detector/AniDetector.php

@@ -25,6 +25,9 @@ public function detect(SplFileObject $file): ?ImageType
         $file->fread(4);
         $aniSignature = $file->fread(4);
 
-        return $riffSignature === 'RIFF' && $aniSignature === 'ACON' ? new ImageType(ImageFormat::ANI, MimeType::APPLICATION_X_NAVI_ANIMATION) : null;
+        return $riffSignature === 'RIFF' && $aniSignature === 'ACON' ? new ImageType(
+            ImageFormat::ANI,
+            MimeType::APPLICATION_X_NAVI_ANIMATION
+        ) : null;
     }
 }

src/Detector/CineonDetector.php

@@ -25,6 +25,9 @@ public function detect(SplFileObject $file): ?ImageType
     {
         $bytes = bin2hex((string)$file->fread(4));
 
-        return $bytes === '802a5fd7' || $bytes === 'd75f2a80' ? new ImageType(ImageFormat::CIN, MimeType::IMAGE_CINEON) : null;
+        return $bytes === '802a5fd7' || $bytes === 'd75f2a80' ? new ImageType(
+            ImageFormat::CIN,
+            MimeType::IMAGE_CINEON
+        ) : null;
     }
 }

src/Detector/HdrDetector.php

@@ -23,6 +23,9 @@ public function detect(SplFileObject $file): ?ImageType
     {
         $bytes = (string)$file->fread(10);
 
-        return $bytes === '#?RADIANCE' || $bytes === '#?RGBE' ? new ImageType(ImageFormat::HDR, MimeType::IMAGE_VND_RADIANCE) : null;
+        return $bytes === '#?RADIANCE' || $bytes === '#?RGBE' ? new ImageType(
+            ImageFormat::HDR,
+            MimeType::IMAGE_VND_RADIANCE
+        ) : null;
     }
 }

src/Detector/HeicDetector.php

@@ -55,6 +55,9 @@ public function detect(SplFileObject $file): ?ImageType
             'msf1' => ImageFormat::HEIC_SEQUENCE,
         ];
 
-        return $bytes === 'ftyp' && isset($ccCodes[$ccCode]) ? new ImageType($ccCodes[$ccCode], MimeType::IMAGE_HEIC) : null;
+        return $bytes === 'ftyp' && isset($ccCodes[$ccCode]) ? new ImageType(
+            $ccCodes[$ccCode],
+            MimeType::IMAGE_HEIC
+        ) : null;
     }
 }

src/Detector/JpegHdrDetector.php

@@ -23,7 +23,9 @@ public function detect(SplFileObject $file): ?ImageType
     {
         $bytes = (string)$file->fread(50);
 
-        return (strpos($bytes, 'HDR_RI') !== false && strpos($bytes, 'ver=11') !== false) ?
-            new ImageType(ImageFormat::JPEG_HDR, MimeType::IMAGE_JPEG) : null;
+        return (strpos($bytes, 'HDR_RI') !== false && strpos($bytes, 'ver=11') !== false) ? new ImageType(
+            ImageFormat::JPEG_HDR,
+            MimeType::IMAGE_JPEG
+        ) : null;
     }
 }

src/ImageTypeDetector.php

@@ -30,8 +30,6 @@ public function addDetector(DetectorInterface $detector): void
      * Add image detector provider.
      *
      * @param ProviderInterface $provider The provider
-     *
-     * @return void
      */
     public function addProvider(ProviderInterface $provider): void
     {
@@ -64,8 +62,6 @@ public function getImageTypeFromFile(SplFileObject $file): ImageType
      * Reads and returns the type of the image.
      *
      * @param SplFileObject $file The image file
-     *
-     * @return ImageType|null
      */
     private function detectFile(SplFileObject $file): ?ImageType
     {

tests/ImageTypeTest.php

@@ -15,8 +15,6 @@ class ImageTypeTest extends TestCase
 {
     /**
      * Test.
-     *
-     * @return void
      */
     public function testCreateInstance(): void
     {
@@ -28,8 +26,6 @@ public function testCreateInstance(): void
 
     /**
      * Test.
-     *
-     * @return void
      */
     public function testCreateInstanceWithError(): void
     {
@@ -39,8 +35,6 @@ public function testCreateInstanceWithError(): void
 
     /**
      * Test.
-     *
-     * @return void
      */
     public function testCreateInstanceWithError2(): void
     {