Return mime type #69

selective-php · Jul 24, 2019 · 20db1c2 · 20db1c2
1 parent 6291c44
commit 20db1c2
Show file tree

Hide file tree

Showing 49 changed files with 356 additions and 446 deletions.
diff --git a/README.md b/README.md
@@ -108,7 +108,13 @@ $detector->addProvider(new RawProvider());
 $detector->addProvider(new VectorProvider());
 $detector->addProvider(new RasterProvider());
 
-echo $detector->getImageTypeFromFile($file)->toString(); // jpeg
+$imageType = $detector->getImageTypeFromFile($file);
+
+// Get the image format
+echo $imageType->getFormat(); // jpeg
+
+// Get the mime type
+echo $imageType->getMimeType(); // image/jpeg
 ```
 
 ### Detect the image type of in-memory object
@@ -123,24 +129,7 @@ $detector = new ImageTypeDetector();
 // Add image detectors
 $detector->addProvider(new RasterProvider());
 
-echo $detector->getImageTypeFromFile($file)->toString();
-```
-
-### Detect mime type of file
-
-```php
-use Selective\ImageType\ImageTypeDetector;
-use Selective\ImageType\Provider\RasterProvider;
-use SplFileObject;
-
-$file = new SplFileObject('example.jpg');
-
-$detector = new ImageTypeDetector();
-
-// Add image detectors
-$detector->addProvider(new RasterProvider());
-
-echo $detector->getMimeTypeFromFile($file)->toString(); // image/jpeg
+echo $detector->getImageTypeFromFile($file)->getFormat();
 ```
 
 ## Similar libraries

diff --git a/src/Detector/AiDetector.php b/src/Detector/AiDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -23,6 +25,6 @@ public function detect(SplFileObject $file): ?ImageType
     {
         $bytes = (string)$file->fread(10);
 
-        return $bytes === '%!PS-Adobe' ? new ImageType(ImageType::AI) : null;
+        return $bytes === '%!PS-Adobe' ? new ImageType(ImageFormat::AI, MimeType::APPLICATION_POSTSCRIPT) : null;
     }
 }
diff --git a/src/Detector/AniDetector.php b/src/Detector/AniDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -23,6 +25,6 @@ public function detect(SplFileObject $file): ?ImageType
         $file->fread(4);
         $aniSignature = $file->fread(4);
 
-        return $riffSignature === 'RIFF' && $aniSignature === 'ACON' ? new ImageType(ImageType::ANI) : null;
+        return $riffSignature === 'RIFF' && $aniSignature === 'ACON' ? new ImageType(ImageFormat::ANI, MimeType::APPLICATION_X_NAVI_ANIMATION) : null;
     }
 }
diff --git a/src/Detector/BmpDetector.php b/src/Detector/BmpDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -19,6 +21,6 @@ final class BmpDetector implements DetectorInterface
      */
     public function detect(SplFileObject $file): ?ImageType
     {
-        return $file->fread(2) === 'BM' ? new ImageType(ImageType::BMP) : null;
+        return $file->fread(2) === 'BM' ? new ImageType(ImageFormat::BMP, MimeType::IMAGE_BMP) : null;
     }
 }
diff --git a/src/Detector/CineonDetector.php b/src/Detector/CineonDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -23,6 +25,6 @@ public function detect(SplFileObject $file): ?ImageType
     {
         $bytes = bin2hex((string)$file->fread(4));
 
-        return $bytes === '802a5fd7' || $bytes === 'd75f2a80' ? new ImageType(ImageType::CIN) : null;
+        return $bytes === '802a5fd7' || $bytes === 'd75f2a80' ? new ImageType(ImageFormat::CIN, MimeType::IMAGE_CINEON) : null;
     }
 }
diff --git a/src/Detector/Cr2Detector.php b/src/Detector/Cr2Detector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -28,6 +30,6 @@ public function detect(SplFileObject $file): ?ImageType
 
         $bytes = $file->fread(8);
 
-        return $bytes === "\x2a\0\x10\0\0\0CR" ? new ImageType(ImageType::CR2) : null;
+        return $bytes === "\x2a\0\x10\0\0\0CR" ? new ImageType(ImageFormat::CR2, MimeType::IMAGE_CR2) : null;
     }
 }
diff --git a/src/Detector/Cr3Detector.php b/src/Detector/Cr3Detector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -23,6 +25,6 @@ public function detect(SplFileObject $file): ?ImageType
 
         $bytes = $file->fread(7);
 
-        return $bytes === 'ftypcrx' ? new ImageType(ImageType::CR3) : null;
+        return $bytes === 'ftypcrx' ? new ImageType(ImageFormat::CR3, MimeType::IMAGE_CR3) : null;
     }
 }
diff --git a/src/Detector/CurDetector.php b/src/Detector/CurDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -19,6 +21,6 @@ final class CurDetector implements DetectorInterface
      */
     public function detect(SplFileObject $file): ?ImageType
     {
-        return $file->fread(3) === "\0\0\2" ? new ImageType(ImageType::CUR) : null;
+        return $file->fread(3) === "\0\0\2" ? new ImageType(ImageFormat::CUR, MimeType::IMAGE_X_ICON) : null;
     }
 }
diff --git a/src/Detector/DcmDetector.php b/src/Detector/DcmDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -21,6 +23,6 @@ public function detect(SplFileObject $file): ?ImageType
     {
         $file->fread(128);
 
-        return $file->fread(4) === 'DICM' ? new ImageType(ImageType::DICOM) : null;
+        return $file->fread(4) === 'DICM' ? new ImageType(ImageFormat::DICOM, MimeType::APPLICATION_DICOM) : null;
     }
 }
diff --git a/src/Detector/DngDetector.php b/src/Detector/DngDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -30,6 +32,7 @@ public function detect(SplFileObject $file): ?ImageType
         $bytes = (string)$file->fread(12);
 
         return ((strpos($bytes, "\x04") !== false || strpos($bytes, "\x02") !== false) &&
-            strpos($bytes, "\x01") && substr_count($bytes, "\0") >= 2) ? new ImageType(ImageType::DNG) : null;
+            strpos($bytes, "\x01") && substr_count($bytes, "\0") >= 2) ?
+            new ImageType(ImageFormat::DNG, MimeType::IMAGE_X_ADOBE_DNG) : null;
     }
 }
diff --git a/src/Detector/DpxDetector.php b/src/Detector/DpxDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -21,6 +23,6 @@ public function detect(SplFileObject $file): ?ImageType
     {
         $bytes = (string)$file->fread(4);
 
-        return $bytes === 'SDPX' || $bytes === 'XPDS' ? new ImageType(ImageType::DPX) : null;
+        return $bytes === 'SDPX' || $bytes === 'XPDS' ? new ImageType(ImageFormat::DPX, MimeType::IMAGE_X_DPX) : null;
     }
 }
diff --git a/src/Detector/EmfDetector.php b/src/Detector/EmfDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -36,6 +38,6 @@ public function detect(SplFileObject $file): ?ImageType
         $emfPlusSignature = (string)$file->fread(4);
         $hasEmfPlus = $emfPlusSignature === 'EMF+';
 
-        return $hasEmf && !$hasEmfPlus ? new ImageType(ImageType::EMF) : null;
+        return $hasEmf && !$hasEmfPlus ? new ImageType(ImageFormat::EMF, MimeType::IMAGE_X_EMF) : null;
     }
 }
diff --git a/src/Detector/EmfPlusDetector.php b/src/Detector/EmfPlusDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -36,6 +38,6 @@ public function detect(SplFileObject $file): ?ImageType
         $emfPlusSignature = (string)$file->fread(4);
         $hasEmfPlus = $emfPlusSignature === 'EMF+';
 
-        return $hasEmf && $hasEmfPlus ? new ImageType(ImageType::EMF_PLUS) : null;
+        return $hasEmf && $hasEmfPlus ? new ImageType(ImageFormat::EMF_PLUS, MimeType::IMAGE_X_EMF) : null;
     }
 }
diff --git a/src/Detector/ExrDetector.php b/src/Detector/ExrDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -21,6 +23,6 @@ public function detect(SplFileObject $file): ?ImageType
     {
         $bytes = (string)$file->fread(4);
 
-        return bin2hex($bytes) === '762f3101' ? new ImageType(ImageType::EXR) : null;
+        return bin2hex($bytes) === '762f3101' ? new ImageType(ImageFormat::EXR, MimeType::IMAGE_X_EXR) : null;
     }
 }
diff --git a/src/Detector/Fr3Detector.php b/src/Detector/Fr3Detector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -28,6 +30,6 @@ public function detect(SplFileObject $file): ?ImageType
 
         $bytes = (string)$file->fread(512);
 
-        return strpos($bytes, 'Hasselblad') > 10 ? new ImageType(ImageType::FR3) : null;
+        return strpos($bytes, 'Hasselblad') > 10 ? new ImageType(ImageFormat::FR3, MimeType::IMAGE_X_3_FR) : null;
     }
 }
diff --git a/src/Detector/GifDetector.php b/src/Detector/GifDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -19,6 +21,6 @@ final class GifDetector implements DetectorInterface
      */
     public function detect(SplFileObject $file): ?ImageType
     {
-        return $file->fread(2) === 'GI' ? new ImageType(ImageType::GIF) : null;
+        return $file->fread(2) === 'GI' ? new ImageType(ImageFormat::GIF, MimeType::IMAGE_GIF) : null;
     }
 }
diff --git a/src/Detector/HdrDetector.php b/src/Detector/HdrDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -21,6 +23,6 @@ public function detect(SplFileObject $file): ?ImageType
     {
         $bytes = (string)$file->fread(10);
 
-        return $bytes === '#?RADIANCE' || $bytes === '#?RGBE' ? new ImageType(ImageType::HDR) : null;
+        return $bytes === '#?RADIANCE' || $bytes === '#?RGBE' ? new ImageType(ImageFormat::HDR, MimeType::IMAGE_VND_RADIANCE) : null;
     }
 }
diff --git a/src/Detector/HeicDetector.php b/src/Detector/HeicDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -33,26 +35,26 @@ public function detect(SplFileObject $file): ?ImageType
         // Source: https://github.com/strukturag/libheif/issues/83
         $ccCodes = [
             // Usual HEIF images
-            'heic' => ImageType::HEIC,
+            'heic' => ImageFormat::HEIC,
             // 10bit images, or anything that uses h265 with range extension
-            'heix' => ImageType::HEIC,
+            'heix' => ImageFormat::HEIC,
             // Brands for image sequences
-            'hevc' => ImageType::HEIC_SEQUENCE,
-            'hevx' => ImageType::HEIC_SEQUENCE,
+            'hevc' => ImageFormat::HEIC_SEQUENCE,
+            'hevx' => ImageFormat::HEIC_SEQUENCE,
             // Multiview
-            'heim' => ImageType::HEIC,
+            'heim' => ImageFormat::HEIC,
             // Scalable
-            'heis' => ImageType::HEIC,
+            'heis' => ImageFormat::HEIC,
             // Multiview sequence
-            'hevm' => ImageType::HEIC_SEQUENCE,
+            'hevm' => ImageFormat::HEIC_SEQUENCE,
             // Scalable sequence
-            'hevs' => ImageType::HEIC_SEQUENCE,
+            'hevs' => ImageFormat::HEIC_SEQUENCE,
             // Special brands
-            'mif1' => ImageType::HEIC,
+            'mif1' => ImageFormat::HEIC,
             // Equivalent case for image sequences
-            'msf1' => ImageType::HEIC_SEQUENCE,
+            'msf1' => ImageFormat::HEIC_SEQUENCE,
         ];
 
-        return $bytes === 'ftyp' && isset($ccCodes[$ccCode]) ? new ImageType($ccCodes[$ccCode]) : null;
+        return $bytes === 'ftyp' && isset($ccCodes[$ccCode]) ? new ImageType($ccCodes[$ccCode], MimeType::IMAGE_HEIC) : null;
     }
 }
diff --git a/src/Detector/IcoDetector.php b/src/Detector/IcoDetector.php
@@ -2,7 +2,9 @@
 
 namespace Selective\ImageType\Detector;
 
+use Selective\ImageType\ImageFormat;
 use Selective\ImageType\ImageType;
+use Selective\ImageType\MimeType;
 use SplFileObject;
 
 /**
@@ -19,6 +21,6 @@ final class IcoDetector implements DetectorInterface
      */
     public function detect(SplFileObject $file): ?ImageType
     {
-        return $file->fread(3) === "\0\0\1" ? new ImageType(ImageType::ICO) : null;
+        return $file->fread(3) === "\0\0\1" ? new ImageType(ImageFormat::ICO, MimeType::IMAGE_X_ICON) : null;
     }
 }