From 2ac9fd6967597d33b020a1140b94f7fe56c9b7f1 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Sat, 12 Sep 2015 15:51:21 +0100 Subject: [PATCH] Merge rPFd78c240a428a: T357: Gracefully handle obviously invalid year tags. --- app/Console/Commands/ImportMLPMA.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/app/Console/Commands/ImportMLPMA.php b/app/Console/Commands/ImportMLPMA.php index 29f96683..fa765a02 100644 --- a/app/Console/Commands/ImportMLPMA.php +++ b/app/Console/Commands/ImportMLPMA.php @@ -177,16 +177,20 @@ class ImportMLPMA extends Command if ($taggedYear !== null && $modifiedDate->year === $taggedYear) { $releasedAt = $modifiedDate; - } else { - if ($taggedYear !== null && $modifiedDate->year !== $taggedYear) { - $this->error('Release years don\'t match! Using the tagged year...'); - $releasedAt = Carbon::create($taggedYear); - - } else { - // $taggedYear is null - $this->error('This track isn\'t tagged with its release year! Using the track\'s last modified date...'); + if ($taggedYear !== null && (string)$taggedYear !== 4) { + $this->error('This track\'s tagged year makes no sense! Using the track\'s last modified date...'); $releasedAt = $modifiedDate; + } else { + if ($taggedYear !== null && $modifiedDate->year !== $taggedYear) { + $this->error('Release years don\'t match! Using the tagged year...'); + $releasedAt = Carbon::create($taggedYear); + + } else { + // $taggedYear is null + $this->error('This track isn\'t tagged with its release year! Using the track\'s last modified date...'); + $releasedAt = $modifiedDate; + } } }