Merge branch 'DBAL-388' into 2.3

lib/Doctrine/DBAL/Types/BlobType.php

@@ -47,11 +47,15 @@ class BlobType extends Type
         if (null === $value) {
             return null;
         }
+
         if (is_string($value)) {
             $value = fopen('data://text/plain;base64,' . base64_encode($value), 'r');
-        } else if ( ! is_resource($value)) {
+        } 
+        
+        if ( ! is_resource($value)) {
             throw ConversionException::conversionFailed($value, self::BLOB);
         }
+
         return $value;
     }