Utilise new syntax

festivalslab · Oct 25, 2022 · 1845463 · 1845463
1 parent b9b9276
commit 1845463
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/src/EventSearchIterator.php b/src/EventSearchIterator.php
@@ -18,7 +18,6 @@
 
 class EventSearchIterator implements IteratorAggregate
 {
-    protected FestivalsApiClient $client;
 
     protected EventSearchResult $last_result;
 
@@ -28,9 +27,8 @@ class EventSearchIterator implements IteratorAggregate
 
     protected int $request_count = 0;
 
-    public function __construct(FestivalsApiClient $client)
+    public function __construct(protected FestivalsApiClient $client)
     {
-        $this->client = $client;
     }
 
     /**

diff --git a/src/FestivalsApiClient.php b/src/FestivalsApiClient.php
@@ -26,13 +26,10 @@ class FestivalsApiClient
 
     protected string $base_url;
 
-    protected Client $guzzle;
-
     protected string $secret;
 
-    public function __construct(Client $guzzle, string $base_url = self::BASE_URL)
+    public function __construct(protected Client $guzzle, string $base_url = self::BASE_URL)
     {
-        $this->guzzle   = $guzzle;
         $this->setBaseUrl($base_url);
     }
 
@@ -90,9 +87,8 @@ public function setCredentials(string $access_key, string $secret): void
     protected function createRequest(string $url): Request
     {
         $full_url = $this->base_url.$this->getSignedUrl($url);
-        $request  = new Request('GET', $full_url);
 
-        return $request;
+        return new Request('GET', $full_url);
     }
 
     protected function decodeJsonResponse(ResponseInterface $response): array
@@ -114,7 +110,7 @@ protected function getSignature(string $data): string
      */
     protected function getSignedUrl(string $url): string
     {
-        if (strpos($url, '?') !== FALSE) {
+        if (str_contains($url, '?')) {
             $url .= '&key='.$this->access_key;
         } else {
             $url .= '?key='.$this->access_key;

diff --git a/src/FestivalsApiClientException.php b/src/FestivalsApiClientException.php
@@ -13,17 +13,13 @@
 
 class FestivalsApiClientException extends RuntimeException
 {
-
-    protected ?string $url;
-
     public function __construct(
         string $message,
-        ?int $code = NULL,
-        ?string $url = NULL,
+        int $code = 0,
+        protected ?string $url = NULL,
         ?Exception $previous_exception = NULL
     ) {
         parent::__construct($message, $code, $previous_exception);
-        $this->url = $url;
     }
 
     public static function invalidJsonResponse(int $code, ?Exception $previous_exception = NULL): FestivalsApiClientException