From e6637a020126c17ab12980d3ab6fb685bc94398d Mon Sep 17 00:00:00 2001 From: Jonathan Flueren <11487762+JonOfUs@users.noreply.github.com> Date: Tue, 24 Aug 2021 13:09:43 +0200 Subject: [PATCH] Use foreach for episode action strings, update variable names --- lib/Core/EpisodeAction/EpisodeActionReader.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/Core/EpisodeAction/EpisodeActionReader.php b/lib/Core/EpisodeAction/EpisodeActionReader.php index 0ab16fa..0a33a97 100644 --- a/lib/Core/EpisodeAction/EpisodeActionReader.php +++ b/lib/Core/EpisodeAction/EpisodeActionReader.php @@ -8,20 +8,21 @@ class EpisodeActionReader { const EPISODEACTION_IDENTIFIER = 'EpisodeAction{'; /** - * @param string $episodeActionString + * @param string $episodeActionsString * @return EpisodeAction[] */ - public function fromString(string $episodeActionString): array { + public function fromString(string $episodeActionsString): array { $episodeActions = []; - $episodeActionStrings = explode(self::EPISODEACTION_IDENTIFIER, $episodeActionString); - - for($i = 1; $i < count($episodeActionStrings); $i++) { + $episodeActionStrings = explode(self::EPISODEACTION_IDENTIFIER, $episodeActionsString); + array_shift($episodeActionStrings); + + foreach($episodeActionStrings as $episodeActionString) { preg_match( '/EpisodeAction{(podcast=\')(?.*?)(\', episode=\')(?.*?)(\', action=)(?.*?)(, timestamp=)(?.*?)(, started=)(?.*?)(, position=)(?.*?)(, total=)(?.*?)}]*/', - self::EPISODEACTION_IDENTIFIER . $episodeActionStrings[$i], + self::EPISODEACTION_IDENTIFIER . $episodeActionString, $matches );