1.3.0

* [+] New generator and new internal storage format
* [*] new template of `MimeTypes` class
* [*] new tests

Author: KarelWintersky

README.md

@@ -85,9 +85,6 @@ $ext = MimeTypes::getExtension('application/json');
 $type = MimeTypes::fromExtension('.json');
 
 // 'application/json'
-// or (use alias)
-
-$type = MimeTypes::getMimeType('.json');
 ```
 
 NB:

makefile

@@ -10,7 +10,7 @@ build:    ##@build Generate new mimetypes.json and src\Mimetypes.php
 	@php ./tools/generate.php
 
 test:		##@test PHPUnit tests
-	@php ./vendor/bin/phpunit
+	@php ./vendor/bin/phpunit --bootstrap vendor/autoload.php --testdox tests
 
 # ------------------------------------------------
 # Add the following 'help' target to your makefile, add help text after each target name starting with '\#\#'

src/MimeTypes.php

@@ -4,48 +4,44 @@
 
 interface MimeTypesInterface
 {
+
     /**
-     * Get all available mime types
+     * Get all available mimetypes as array keys
      *
-     * @return string[]
+     * @return array
      */
-    public static function getMimeTypes():array;
+    public static function getAllMimeTypes():array;
 
     /**
-     * Get EXTENSION from MIMETYPE string
+     * Get all available extensios (as array keys)
      *
-     * @param string $mime_type
-     * @return string
+     * @return array
      */
-    public static function getExtension(string $mime_type):string;
+    public static function getAllExtensions():array;
 
     /**
-     * Get mimetype from extension (extension may contain dot)
+     * Get EXTENSION from MIMETYPE string
      *
-     * @param string $extension
+     * @param string $mime_type
      * @return string
      */
-    public static function fromExtension(string $extension):string;
+    public static function getExtension(string $mime_type):string;
 
     /**
-     * Alias of fromExtension()
+     * Get MIMETYPE from EXTENSION (extension may contain dot)
      *
      * @param string $extension
      * @return string
      */
-    public static function getMimeType(string $extension):string;
+    public static function fromExtension(string $extension):string;
 
     /**
-     * Get mimetype from filename with extension
+     * get MIMETYPE from filename with extension
      *
      * @param string $filename
      * @return string
      */
     public static function fromFilename(string $filename):string;
 
 
-
-
-
-
 }

src/MimeTypesInterface.php

@@ -5,20 +5,58 @@
 
 class MimeTypesTest extends TestCase {
 
+    /**
+     * @return void
+     * @testdox get mimetype for unknown (undefined extension)
+     */
     public function testGetMimeTypeUndefined()
     {
         $this->assertEquals('', MimeTypes::fromExtension('undefined'));
     }
 
+    /**
+     * @return void
+     * @testdox get extension for undefined mimetype
+     */
     public function testGetExtensionUndefined()
     {
         $this->assertEquals('', MimeTypes::getExtension('undefined'));
     }
 
-    public function testVaidExtensions()
+    /**
+     * @return void
+     * @testdox get mimetype for valid extension (.json)
+     */
+    public function testGetMimeType()
     {
-        $this->assertEquals('json', MimeTypes::getExtension('application/json'));
         $this->assertEquals('application/json', MimeTypes::fromExtension('.json'));
     }
 
+    /**
+     * @return void
+     * @testdox get Extension for valid mimetype 'application/json'
+     */
+    public function getGetExtension()
+    {
+        $this->assertEquals('json', MimeTypes::getExtension('application/json'));
+    }
+
+    /**
+     * @return void
+     * @testdox get mimetype for valid extension (.jpg)
+     */
+    public function testGetMimeTypeJPEG()
+    {
+        $this->assertEquals('image/jpeg', MimeTypes::fromExtension('.jpg'));
+    }
+
+    /**
+     * @return void
+     * @testdox get Extension for valid mimetype 'image/jpeg'
+     */
+    public function getGetExtensionJPEG()
+    {
+        $this->assertEquals('jpg', MimeTypes::getExtension('image/jpeg'));
+    }
+
 }

tests/MimeTypesTest.php

@@ -1,4 +1,3 @@
-#! /usr/bin/env php
 <?php
 
 function var_export_short($expression, $return = false): ?string
@@ -21,87 +20,102 @@ function var_export_short($expression, $return = false): ?string
 
 $template_generate_date = date('j M Y, g:ia T');
 
-$downloaded_mimes = file(__DIR__ . '/mime.types', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+$fn_source_types = __DIR__ . '/mime.types';
+$fn_source_types_custom = __DIR__ . '/mime.types.custom';
 
-if (empty($downloaded_mimes)) {
-    die('mime.types is empty or not downloded');
+if (!is_readable($fn_source_types)) {
+    die('mime.types is not downloaded or not readable');
 }
+$mime_types_default_text = file($fn_source_types, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 
-$custom_mimes = file(__DIR__ . '/mime.types.custom', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+$mime_types_custom_text = [];
+if (is_readable($fn_source_types_custom)) {
+    $mime_types_custom_text = file($fn_source_types_custom, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+}
 
-$source_mimes = array_merge($custom_mimes, $downloaded_mimes);
+$source_mimes = array_merge($mime_types_custom_text, $mime_types_default_text);
 
-$lines = [];
+$defs = [];
 
-// clear comments
 foreach ($source_mimes as $line) {
-    if (strpos($line, '#') !== 0) {
+    $line = trim(preg_replace('~\\#.*~', '', $line));
+
+    if (!empty($line)) {
         preg_match_all('/^((\w|\/|\.|-|\+)+)(\s+)([^\n]*)$/im', $line, $match);
+
         $type = $match[1][0];
         $extensions = explode(' ', $match[4][0]);
 
-        if (!array_key_exists($type, $lines)) {
-            $lines[$type] = $extensions;
+        if (!array_key_exists($type, $defs)) {
+            $defs[$type] = $extensions;
         }
     }
 }
 
-$mimes = [];
+ksort($defs);
 
-foreach ($lines as $type => $extensions) {
-    foreach ($extensions as $extension) {
-        if (!isset($lines[$extension])) {
-            $mimes[$extension] = $type;
-        }
+$mapping = [
+    // ext -> mime
+    'mimes'         =>  [],
+
+    // mime -> ext
+    'extensions'    =>  []
+];
+
+foreach ($defs as $mime => $exts) {
+    foreach ($exts as $extension) {
+        // $mapping['mimes'][$extension][] = $mime;
+        // $mapping['mimes'][$extension] = array_unique($mapping['mimes'][$extension]);
+        $mapping['mimes'][$extension] = $mime;
+
+        // $mapping['extensions'][$mime][] = $extension;
+        // $mapping['extensions'][$mime] = array_unique($mapping['extensions'][$mime]);
     }
+    $mapping['extensions'][$mime] = $exts[0];
 }
-$customize_json = __DIR__ . '/customize.json';
 
-if (file_exists($customize_json)) {
-    $entries = json_decode(file_get_contents($customize_json), true);
+if (is_readable(__DIR__ . '/customize.json')) {
+    $entries = json_decode(file_get_contents(__DIR__ . '/customize.json'), true);
 
-    foreach ($entries as $extensions => $type) {
+    foreach ($entries as $extensions => $mime) {
         $extensions = explode(' ', $extensions);
 
         foreach ($extensions as $extension) {
-            $mimes[$extension] = $type;
+            $mapping['mimes'][$extension] = $mime;
+        }
+
+        if (!array_key_exists($mime, $mapping['extensions'])) {
+            $mapping['extensions'][$mime] = $extensions[0];
         }
     }
 }
+ksort($mapping['mimes']);
+ksort($mapping['extensions']);
 
-// WRITE JSON DOCUMENT
-// ksort($mimes);
+var_dump($mapping);
 
-$mimetypes_json = __DIR__ . '/mimetypes.json';
+/**
+ * Output
+ */
 
-if (file_put_contents($mimetypes_json, json_encode($mimes, JSON_PRETTY_PRINT))) {
-    echo print_r($mimes, true)
+$mimetypes_json = __DIR__ . '/mimetypes.json';
+if (file_put_contents($mimetypes_json, json_encode($mapping, JSON_PRETTY_PRINT))) {
+    echo print_r($mapping, true)
         . PHP_EOL
         . "\033[01;32mSuccessfully wrote {$mimetypes_json}\033[00m"
         . PHP_EOL;
 } else {
     echo "Failed to write {$mimetypes_json}. Please ensure that this file system location is writable." . PHP_EOL;
 }
 
-/*$max_ext_length = 0;
-foreach ($mimes as $ext => $type) {
-    $max_ext_length = max($max_ext_length, strlen($ext));
-}
+/*
+ * WRITE PHP CLASS
+ */
 
-$text = '';
-$text .= "return [" . PHP_EOL;
-foreach ($mimes as $ext => $type) {
-    $text .= "            '{$ext}' ";
-    // $text .= str_repeat(' ', $max_ext_length + 2 - strlen($ext));
-    $text .= "=> '{$type}'," . PHP_EOL;
-}
-$text .= "        ];";*/
-
-# WRITE PHP CLASS
 $content = file_get_contents(__DIR__ . '/template.txt');
 $content = str_replace('%%generate_datetime%%', $template_generate_date, $content);
-$content = str_replace('%%return_array_mime_types%%', "return " . var_export_short($mimes, true) . ";", $content);
-$content = str_replace('%%array_mime_types%%', var_export_short($mimes, true), $content);
+// $content = str_replace('%%return_array_mime_types%%', "return " . var_export_short($mapping, true) . ";", $content);
+$content = str_replace('%%array_mime_types%%', var_export_short($mapping, true), $content);
 
 //$content = str_replace('%%array_mime_types%%', $text, $content); // преформатированный красивый вывод
 
@@ -115,3 +129,4 @@ function var_export_short($expression, $return = false): ?string
 // Done.
 echo PHP_EOL;
 
+