Skip to content

Merge: Fix int types for enclosures #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alkarex merged 2 commits into from
Apr 17, 2026
Merged

Merge: Fix int types for enclosures #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d0dfdf
Fix int types for enclosures
Alkarex Apr 17, 2026
e15c1d7
Merge remote-tracking branch 'origin/fix-enclosure-int-types' into me…
Alkarex Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Item.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,10 +1458,10 @@ public function get_enclosures()
$bitrate = $this->sanitize($content['attribs']['']['bitrate'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
}
if (isset($content['attribs']['']['channels'])) {
$channels = $this->sanitize($content['attribs']['']['channels'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
$channels = (int) $this->sanitize($content['attribs']['']['channels'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
}
if (isset($content['attribs']['']['duration'])) {
$duration = $this->sanitize($content['attribs']['']['duration'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
$duration = (int) $this->sanitize($content['attribs']['']['duration'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
} else {
$duration = $duration_parent;
}
Expand Down Expand Up @@ -1915,10 +1915,10 @@ public function get_enclosures()
$bitrate = $this->sanitize($content['attribs']['']['bitrate'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
}
if (isset($content['attribs']['']['channels'])) {
$channels = $this->sanitize($content['attribs']['']['channels'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
$channels = (int) $this->sanitize($content['attribs']['']['channels'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
}
if (isset($content['attribs']['']['duration'])) {
$duration = $this->sanitize($content['attribs']['']['duration'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
$duration = (int) $this->sanitize($content['attribs']['']['duration'], \SimplePie\SimplePie::CONSTRUCT_TEXT);
} else {
$duration = $duration_parent;
}
Expand Down
106 changes: 106 additions & 0 deletions tests/Unit/EnclosureTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,110 @@ public static function getEnclosuresProvider(): iterable
2,
];
}

/**
* @dataProvider getEnclosureIntAttributesProvider
*/
public function test_enclosure_int_attributes(string $data, ?int $expectedDuration, ?int $expectedChannels, ?int $expectedLength): void
{
$feed = new SimplePie();
$feed->set_raw_data($data);
$feed->enable_cache(false);
$feed->init();

$item = $feed->get_item(0);
self::assertInstanceOf(Item::class, $item);

$enclosure = $item->get_enclosure(0);
self::assertInstanceOf(Enclosure::class, $enclosure);
self::assertSame($expectedDuration, $enclosure->get_duration());
self::assertSame($expectedChannels, $enclosure->get_channels());
self::assertSame($expectedLength, $enclosure->get_length());
}

/**
* @return iterable<array{string, ?int, ?int, ?int}>
*/
public static function getEnclosureIntAttributesProvider(): iterable
{
yield 'Test media:content duration, channels and fileSize' => [
<<<XML
<rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/">
<channel>
<title>Test</title>
<link>http://example.net/</link>
<item>
<title>Test item</title>
<link>http://example.net/1</link>
<media:content url="http://example.net/audio.mp3" type="audio/mpeg" duration="123" channels="2" fileSize="987654" />
</item>
</channel>
</rss>
XML
,
123,
2,
987654,
];

yield 'Test media:group media:content duration, channels and fileSize' => [
<<<XML
<rss version="2.0" xmlns:media="http://search.yahoo.com/mrss/">
<channel>
<title>Test</title>
<link>http://example.net/</link>
<item>
<title>Test item</title>
<link>http://example.net/2</link>
<media:group>
<media:content url="http://example.net/video.mp4" type="video/mp4" duration="456" channels="6" fileSize="12345678" />
</media:group>
</item>
</channel>
</rss>
XML
,
456,
6,
12345678,
];

yield 'Test RSS 2.0 enclosure length' => [
<<<XML
<rss version="2.0">
<channel>
<title>Test</title>
<link>http://example.net/</link>
<item>
<title>Test item</title>
<link>http://example.net/3</link>
<enclosure url="http://example.net/audio.mp3" type="audio/mpeg" length="55443322" />
</item>
</channel>
</rss>
XML
,
null,
null,
55443322,
];

yield 'Test Atom 1.0 enclosure length' => [
<<<XML
<feed xmlns="http://www.w3.org/2005/Atom">
<title>Test</title>
<link href="http://example.net/" />
<entry>
<title>Test item</title>
<link href="http://example.net/4" />
<link rel="enclosure" href="http://example.net/video.mp4" type="video/mp4" length="11223344" />
</entry>
</feed>
XML
,
null,
null,
11223344,
];
}
}
Loading