Issue #2514300 by twistor: Fatal error when I try to import feed items

mappers/file.inc

@@ -112,8 +112,7 @@ function file_feeds_set_target(FeedsSource $source, $entity, $target, array $val
         if ($v) {
           try {
             $v->setAllowedExtensions($instance_info['settings']['file_extensions']);
-            $file = $v->getFile($destination);
-            $field[LANGUAGE_NONE][$delta] += (array) $file;
+            $field[LANGUAGE_NONE][$delta] += (array) $v->getFile($destination);
             // @todo: Figure out how to properly populate this field.
             $field[LANGUAGE_NONE][$delta]['display'] = 1;
           }

plugins/FeedsParser.inc

@@ -435,7 +435,7 @@ class FeedsEnclosure extends FeedsElement {
         $file           = new stdClass();
         $file->uid      = 0;
         $file->uri      = $this->getSanitizedUri();
-        $file->filemime = $this->mime_type;
+        $file->filemime = $this->getMIMEType();
         $file->filename = $this->getSafeFilename();
 
         if (drupal_dirname($file->uri) !== $destination) {

plugins/FeedsSimplePieParser.inc

@@ -52,6 +52,7 @@ class FeedsSimplePieEnclosure extends FeedsEnclosure {
   public function getMIMEType() {
     return $this->simplepie_enclosure->get_real_type();
   }
+
 }
 
 /**
@@ -232,4 +233,5 @@ class FeedsSimplePieParser extends FeedsParser {
     $words = array_slice($words, 0, 3);
     return implode(' ', $words);
   }
+
 }

tests/feeds_parser_syndication.test

@@ -9,6 +9,7 @@
  * Test single feeds.
  */
 class FeedsSyndicationParserTestCase extends FeedsWebTestCase {
+
   public static function getInfo() {
     return array(
       'name' => 'Syndication parsers',
@@ -39,6 +40,15 @@ class FeedsSyndicationParserTestCase extends FeedsWebTestCase {
         $this->assertText('Created ' . $assertions['item_count'] . ' nodes');
       }
     }
+
+    feeds_include_simplepie();
+    variable_set('feeds_never_use_curl', TRUE);
+
+    $link = $GLOBALS['base_url'] . '/testing/feeds/flickr.xml';
+    $enclosure = new FeedsSimplePieEnclosure(new SimplePie_Enclosure($link));
+
+    $enclosure->setAllowedExtensions('xml');
+    $this->assertEqual(1, $enclosure->getFile('public://')->fid);
   }
 
   /**
@@ -55,4 +65,5 @@ class FeedsSyndicationParserTestCase extends FeedsWebTestCase {
       ),
     );
   }
+
 }