[Feature] Reverse lookup

.gitattributes

@@ -3,7 +3,7 @@
 /phpstan.neon export-ignore
 /bin export-ignore
 /.github export-ignore
-/.php_cs.dist export-ignore
+/.php-cs-fixer.dist.php export-ignore
 /.scrutinizer.yml export-ignore
 /src/Generation export-ignore
 /test_files export-ignore

.github/workflows/quality-assurance.yml

@@ -20,12 +20,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '7.2', '7.3', '7.4', '8.0' ]
+        php: [ '7.4', '8.0', '8.1', '8.2' ]
         composer-flags: [ '' ]
         upgrade-aws-sdk: [ 'no' ]
         phpunit-flags: [ '--coverage-text' ]
         include:
-          - php: '7.2'
+          - php: '7.4'
             composer-flags: '--prefer-lowest'
             phpunit-flags: '--no-coverage'
     steps:
@@ -39,6 +39,6 @@ jobs:
       - run: COMPOSER_OPTS='${{ matrix.composer-flags }}' vendor/bin/phpunit ${{ matrix.phpunit-flags }}
       - run: vendor/bin/phpstan analyse -l 6 src
         if: ${{ matrix.php == '7.4' }}
-      - run: vendor/bin/php-cs-fixer fix --dry-run
+      - run: vendor/bin/php-cs-fixer fix --diff --dry-run
         if: ${{ matrix.php == '7.4' }}
 

.gitignore

@@ -1,6 +1,7 @@
 /vendor/
 /coverage/
 /.phpunit.result.cache
-/.php_cs.cache
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
 /phpunit.xml
 /composer.lock

.php_cs.dist → .php-cs-fixer.dist.php

@@ -4,13 +4,13 @@
     ->in([__DIR__ . '/src'])
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
         'binary_operator_spaces' => true,
         'single_line_after_imports' => true,
-        'blank_line_before_return' => true,
+        'blank_line_before_statement' => ['statements' => ['return']],
         'cast_spaces' => true,
         'concat_space' => ['spacing' => 'one'],
         'no_singleline_whitespace_before_semicolons' => true,

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 1.12.0 - 2022-08-03
+
+### Updated
+
+- Updated lookup
+
+## 1.11.0 - 2022-04-17
+
+### Updated
+
+- Updated lookup
+
+## 1.10.0 - 2022-04-11
+
+### Fixed
+
+- Added Flysystem v1 inconclusive mime-types and made it configurable as a constructor parameter.
+
+## 1.9.0 - 2021-11-21
+
+### Updated
+
+- Updated lookup
+
 ## 1.8.0 - 2021-09-25
 
 ### Added

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2020 Frank de Jonge
+Copyright (c) 2013-2023 Frank de Jonge
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -9,16 +9,17 @@
         }
     ],
     "scripts": {
+        "test": "vendor/bin/phpunit",
         "phpstan": "vendor/bin/phpstan analyse -l 6 src"
     },
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-fileinfo": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5.8 || ^9.3",
+        "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0",
         "phpstan/phpstan": "^0.12.68",
-        "friendsofphp/php-cs-fixer": "^2.18"
+        "friendsofphp/php-cs-fixer": "^3.2"
     },
     "autoload": {
         "psr-4": {
@@ -27,7 +28,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.2.0"
+            "php": "7.4.0"
         }
     }
 }

src/ExtensionLookup.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace League\MimeTypeDetection;
+
+interface ExtensionLookup
+{
+    public function lookupExtension(string $mimetype): ?string;
+
+    /**
+     * @return string[]
+     */
+    public function lookupAllExtensions(string $mimetype): array;
+}

src/ExtensionMimeTypeDetector.php

@@ -6,7 +6,7 @@
 
 use const PATHINFO_EXTENSION;
 
-class ExtensionMimeTypeDetector implements MimeTypeDetector
+class ExtensionMimeTypeDetector implements MimeTypeDetector, ExtensionLookup
 {
     /**
      * @var ExtensionToMimeTypeMap
@@ -39,4 +39,18 @@ public function detectMimeTypeFromBuffer(string $contents): ?string
     {
         return null;
     }
+
+    public function lookupExtension(string $mimetype): ?string
+    {
+        return $this->extensions instanceof ExtensionLookup
+            ? $this->extensions->lookupExtension($mimetype)
+            : null;
+    }
+
+    public function lookupAllExtensions(string $mimetype): array
+    {
+        return $this->extensions instanceof ExtensionLookup
+            ? $this->extensions->lookupAllExtensions($mimetype)
+            : [];
+    }
 }

src/ExtensionMimeTypeDetectorTest.php

@@ -11,6 +11,7 @@ class ExtensionMimeTypeDetectorTest extends TestCase
 {
     /**
      * @test
+     *
      * @dataProvider expectedLookupResults
      */
     public function looking_up_mimetype(string $path, ?string $expectedMimeType): void
@@ -35,7 +36,7 @@ public function detecting_from_bugger_always_returns_null(): void
         $this->assertNull($mimeType);
     }
 
-    public function expectedLookupResults(): Generator
+    public static function expectedLookupResults(): Generator
     {
         yield ['thing.jpg', 'image/jpeg'];
         yield ['file.svg', 'image/svg+xml'];

src/FinfoMimeTypeDetector.php

@@ -9,9 +9,15 @@
 use const PATHINFO_EXTENSION;
 use finfo;
 
-class FinfoMimeTypeDetector implements MimeTypeDetector
+class FinfoMimeTypeDetector implements MimeTypeDetector, ExtensionLookup
 {
-    private const INCONCLUSIVE_MIME_TYPES = ['application/x-empty', 'text/plain', 'text/x-asm'];
+    private const INCONCLUSIVE_MIME_TYPES = [
+        'application/x-empty',
+        'text/plain',
+        'text/x-asm',
+        'application/octet-stream',
+        'inode/x-empty',
+    ];
 
     /**
      * @var finfo
@@ -28,14 +34,21 @@ class FinfoMimeTypeDetector implements MimeTypeDetector
      */
     private $bufferSampleSize;
 
+    /**
+     * @var array<string>
+     */
+    private $inconclusiveMimetypes;
+
     public function __construct(
         string $magicFile = '',
         ExtensionToMimeTypeMap $extensionMap = null,
-        ?int $bufferSampleSize = null
+        ?int $bufferSampleSize = null,
+        array $inconclusiveMimetypes = self::INCONCLUSIVE_MIME_TYPES
     ) {
         $this->finfo = new finfo(FILEINFO_MIME_TYPE, $magicFile);
         $this->extensionMap = $extensionMap ?: new GeneratedExtensionToMimeTypeMap();
         $this->bufferSampleSize = $bufferSampleSize;
+        $this->inconclusiveMimetypes = $inconclusiveMimetypes;
     }
 
     public function detectMimeType(string $path, $contents): ?string
@@ -44,7 +57,7 @@ public function detectMimeType(string $path, $contents): ?string
             ? (@$this->finfo->buffer($this->takeSample($contents)) ?: null)
             : null;
 
-        if ($mimeType !== null && ! in_array($mimeType, self::INCONCLUSIVE_MIME_TYPES)) {
+        if ($mimeType !== null && ! in_array($mimeType, $this->inconclusiveMimetypes)) {
             return $mimeType;
         }
 
@@ -76,4 +89,18 @@ private function takeSample(string $contents): string
 
         return (string) substr($contents, 0, $this->bufferSampleSize);
     }
+
+    public function lookupExtension(string $mimetype): ?string
+    {
+        return $this->extensionMap instanceof ExtensionLookup
+            ? $this->extensionMap->lookupExtension($mimetype)
+            : null;
+    }
+
+    public function lookupAllExtensions(string $mimetype): array
+    {
+        return $this->extensionMap instanceof ExtensionLookup
+            ? $this->extensionMap->lookupAllExtensions($mimetype)
+            : [];
+    }
 }

src/FinfoMimeTypeDetectorTest.php

@@ -18,6 +18,16 @@ protected function setUp(): void
         $this->detector = new FinfoMimeTypeDetector();
     }
 
+    /**
+     * @test
+     */
+    public function detecting_a_csv(): void
+    {
+        $mimeType = $this->detector->detectMimeType('something.csv', '');
+
+        $this->assertEquals('text/csv', $mimeType);
+    }
+
     /**
      * @test
      */