Merge pull request #14 from jczerwinski/allow-blank-mime

Support parsing of datauri's without mediatype.
Also tag as 0.2.5

Author: jygaulier

CHANGELOG.md

@@ -1,6 +1,10 @@
 CHANGELOG
 ---------
 
+- **0.2.5 (2018-02-27)**
+
+    - Support parsing of datauri's without mediatype.
+
 - **0.1.1 (2014-08-22)**
 
     - Fix parsing of mime types that contains a plus sign and a dot.

composer.json

@@ -1,5 +1,6 @@
 {
   "name": "data-uri/data-uri",
+  "version": "0.2.5",
   "type": "library",
   "description": "PHP DataURI component",
   "keywords": ["data-uri", "data", "URI"],

src/DataURI/Parser.php

@@ -38,7 +38,7 @@ class Parser
      * offset #2 Parameters
      * offset #3 Datas
      */
-    const DATA_URI_REGEXP = '/data:([a-zA-Z-\/+]+)([a-zA-Z0-9-_;=.+]+)?,(.*)/';
+    const DATA_URI_REGEXP = '/data:([a-zA-Z-\/+]*)([a-zA-Z0-9-_;=.+]+)?,(.*)/';
 
     /**
      * Parse a data URI and return a DataUri\Data
@@ -60,7 +60,7 @@ public static function parse($dataUri, $len = Data::TAGLEN, $strict = false)
 
         $base64 = false;
 
-        $mimeType = $matches[1];
+        $mimeType = $matches[1] ? $matches[1] : null;
         $params = $matches[2];
         $rawData = $matches[3];
 

tests/ParserTest.php

@@ -38,7 +38,8 @@ public function testParse()
             "data:text/plain;charset=utf-8,%23%24%25",
             "data:application/vnd-xxx-query,select_vcount,fcol_from_fieldtable/local",
 			"data:image/svg+xml;base64," . $b64,
-			"data:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;base64," . $b64
+			"data:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;base64," . $b64,
+            "data:;base64," . $b64,
         );
 
         $dataURI = DataURI\Parser::parse($tests[0]);
@@ -61,6 +62,9 @@ public function testParse()
 
         $dataURI = DataURI\Parser::parse($tests[4]);
         $this->assertEquals('image/svg+xml', $dataURI->getMimeType());
+
+        $dataURI = DataURI\Parser::parse($tests[6]);
+        $this->assertEquals('text/plain', $dataURI->getMimeType());
 }
 
     /**