diff --git a/bridges/CVEDetailsBridge.php b/bridges/CVEDetailsBridge.php index 27b4008c..b52d290e 100644 --- a/bridges/CVEDetailsBridge.php +++ b/bridges/CVEDetailsBridge.php @@ -57,7 +57,7 @@ class CVEDetailsBridge extends BridgeAbstract $content = $tr->find('.cvesummarylong', 0)->innertext; $cweList = $detailHtml->find('h2', 2)->next_sibling(); foreach ($cweList->find('li') as $li) { - $cweWithDescription = $li->find('a', 0)->innertext; + $cweWithDescription = $li->find('a', 0)->innertext ?? ''; if (preg_match('/CWE-(\d+)/', $cweWithDescription, $cwe)) { $categories[] = 'CWE-' . $cwe[1]; diff --git a/bridges/CubariBridge.php b/bridges/CubariBridge.php index 9a08dbba..a7b6d69d 100644 --- a/bridges/CubariBridge.php +++ b/bridges/CubariBridge.php @@ -47,8 +47,8 @@ class CubariBridge extends BridgeAbstract */ public function collectData() { - $jsonSite = getContents($this->getInput('gist')); - $jsonFile = json_decode($jsonSite, true); + $json = getContents($this->getInput('gist')); + $jsonFile = json_decode($json, true); $this->mangaTitle = $jsonFile['title']; @@ -66,12 +66,14 @@ class CubariBridge extends BridgeAbstract { $url = $this->getInput('gist'); - preg_match('/\/([a-z]*)\.githubusercontent.com(.*)/', $url, $matches); - - // raw or gist is first match. - $unencoded = $matches[1] . $matches[2]; - - return base64_encode($unencoded); + if (preg_match('/\/([a-z]*)\.githubusercontent.com(.*)/', $url, $matches)) { + // raw or gist is first match. + $unencoded = $matches[1] . $matches[2]; + return base64_encode($unencoded); + } else { + // todo: fix this + return ''; + } } private function getSanitizedHash($string) diff --git a/lib/FeedParser.php b/lib/FeedParser.php index 90df548d..a9aabde0 100644 --- a/lib/FeedParser.php +++ b/lib/FeedParser.php @@ -64,7 +64,7 @@ final class FeedParser $feed['items'][] = $this->parseAtomItem($item); } } else { - throw new \Exception(sprintf('Unable to detect feed format from `%s`', $url)); + throw new \Exception('Unable to detect feed format'); } return $feed; @@ -163,7 +163,9 @@ final class FeedParser } if (isset($feedItem->enclosure) && !empty($feedItem->enclosure['url'])) { - $item['enclosures'] = [(string)$feedItem->enclosure['url']]; + $item['enclosures'] = [ + (string)$feedItem->enclosure['url'], + ]; } return $item; } @@ -189,6 +191,7 @@ final class FeedParser { $item = []; if (isset($feedItem->link)) { + // todo: trim uri $item['uri'] = (string)$feedItem->link; } if (isset($feedItem->title)) {