From 70e989b287a9434d1c8b895bde737c843b7d0b2a Mon Sep 17 00:00:00 2001 From: Peter Thaleikis Date: Fri, 9 Oct 2020 13:12:53 +0400 Subject: [PATCH] Tweak variable naming in ArrayCrawlQueue (#326) --- src/CrawlQueues/ArrayCrawlQueue.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/CrawlQueues/ArrayCrawlQueue.php b/src/CrawlQueues/ArrayCrawlQueue.php index be42339..c52306a 100644 --- a/src/CrawlQueues/ArrayCrawlQueue.php +++ b/src/CrawlQueues/ArrayCrawlQueue.php @@ -23,15 +23,15 @@ class ArrayCrawlQueue implements CrawlQueue */ protected array $pendingUrls = []; - public function add(CrawlUrl $url): CrawlQueue + public function add(CrawlUrl $crawlUrl): CrawlQueue { - $urlString = (string) $url->url; + $urlString = (string) $crawlUrl->url; if (! isset($this->urls[$urlString])) { - $url->setId($urlString); + $crawlUrl->setId($urlString); - $this->urls[$urlString] = $url; - $this->pendingUrls[$urlString] = $url; + $this->urls[$urlString] = $crawlUrl; + $this->pendingUrls[$urlString] = $crawlUrl; } return $this; @@ -51,15 +51,15 @@ public function getUrlById($id): CrawlUrl return $this->urls[$id]; } - public function hasAlreadyBeenProcessed(CrawlUrl $url): bool + public function hasAlreadyBeenProcessed(CrawlUrl $crawlUrl): bool { - $url = (string) $url->url; + $urlString = (string) $crawlUrl->url; - if (isset($this->pendingUrls[$url])) { + if (isset($this->pendingUrls[$urlString])) { return false; } - if (isset($this->urls[$url])) { + if (isset($this->urls[$urlString])) { return true; } @@ -68,9 +68,9 @@ public function hasAlreadyBeenProcessed(CrawlUrl $url): bool public function markAsProcessed(CrawlUrl $crawlUrl): void { - $url = (string) $crawlUrl->url; + $urlString = (string) $crawlUrl->url; - unset($this->pendingUrls[$url]); + unset($this->pendingUrls[$urlString]); } /** @@ -81,14 +81,14 @@ public function markAsProcessed(CrawlUrl $crawlUrl): void public function has($crawlUrl): bool { if ($crawlUrl instanceof CrawlUrl) { - $url = (string) $crawlUrl->url; + $urlString = (string) $crawlUrl->url; } elseif ($crawlUrl instanceof UriInterface) { - $url = (string) $crawlUrl; + $urlString = (string) $crawlUrl; } else { throw InvalidUrl::unexpectedType($crawlUrl); } - return isset($this->urls[$url]); + return isset($this->urls[$urlString]); } public function getFirstPendingUrl(): ?CrawlUrl