Remove Feed::label() and Feed::url() (#30)

Author: tangrufus

composer.json

@@ -60,8 +60,8 @@
     },
     "scripts": {
         "fixture:download": [
-            "curl -o ./tests/Fixtures/vulnerabilities.production.json https://www.wordfence.com/api/intelligence/v2/vulnerabilities/production",
-            "curl -o ./tests/Fixtures/vulnerabilities.scanner.json https://www.wordfence.com/api/intelligence/v2/vulnerabilities/scanner"
+            "curl -o ./tests/Fixtures/vulnerabilities.Production.json https://www.wordfence.com/api/intelligence/v2/vulnerabilities/production",
+            "curl -o ./tests/Fixtures/vulnerabilities.Scanner.json https://www.wordfence.com/api/intelligence/v2/vulnerabilities/scanner"
         ],
         "lint": [
             "@composer normalize --dry-run",

src/Client.php

@@ -49,10 +49,7 @@ public function fetch(Feed $feed): Generator
     private function get(Feed $feed): ResponseInterface
     {
         try {
-            return $this->http->request(
-                'GET',
-                $feed->url(),
-            );
+            return $this->http->request('GET', $feed->value);
         } catch (TransferException $exception) {
             // Guzzle throws exceptions for non-2xx responses.
             throw HttpException::fromResponse($feed, $exception);

src/Exceptions/HttpException.php

@@ -14,7 +14,7 @@ public static function fromResponse(Feed $feed, TransferException $original): se
     {
         $message = sprintf(
             'Unable to fetch from Wordfence %s feed. %s',
-            $feed->label(),
+            $feed->name,
             $original->getMessage(),
         );
 

src/Exceptions/InvalidJsonException.php

@@ -14,7 +14,7 @@ public static function forFeedResponse(Feed $feed): self
         return new self(
             sprintf(
                 'Unable to parse Wordfence %s feed response: invalid JSON',
-                $feed->label(),
+                $feed->name,
             ),
         );
     }

src/Feed.php

@@ -4,24 +4,8 @@
 
 namespace TypistTech\WordfenceApi;
 
-enum Feed
+enum Feed: string
 {
-    case Production;
-    case Scanner;
-
-    public function label(): string // TODO!
-    {
-        return match ($this) {
-            self::Production => 'production',
-            self::Scanner => 'scanner',
-        };
-    }
-
-    public function url(): string
-    {
-        return match ($this) {
-            self::Production => 'https://www.wordfence.com/api/intelligence/v2/vulnerabilities/production',
-            self::Scanner => 'https://www.wordfence.com/api/intelligence/v2/vulnerabilities/scanner',
-        };
-    }
+    case Production = 'https://www.wordfence.com/api/intelligence/v2/vulnerabilities/production';
+    case Scanner = 'https://www.wordfence.com/api/intelligence/v2/vulnerabilities/scanner';
 }

tests/Feature/TestCase.php

@@ -15,7 +15,7 @@ abstract class TestCase extends BaseTestCase
 {
     public function mockHttpClient(Feed $feed): Http
     {
-        $path = fixture('vulnerabilities.'.$feed->label().'.json'); // TODO!
+        $path = fixture("vulnerabilities.{$feed->name}.json");
         $body = file_get_contents($path);
 
         $mock = new MockHandler([