Refactoring

Author: redjanym

examples/messaging.php

@@ -10,7 +10,6 @@
 $testToken = '123456789';
 
 $client = new Client($serviceAccountPath);
-$client->applyCredentials();
 
 $recipient = new Device($testToken);
 

src/Client.php

@@ -21,6 +21,7 @@ public function __construct(string $serviceAccountPath)
 
         $this->serviceAccountPath = $serviceAccountPath;
         $this->guzzleClient = new \GuzzleHttp\Client();
+        $this->applyCredentials();
     }
 
     public function setServiceAccountPath(string $serviceAccountPath): self
@@ -30,10 +31,11 @@ public function setServiceAccountPath(string $serviceAccountPath): self
         }
 
         $this->serviceAccountPath = $serviceAccountPath;
+        $this->applyCredentials();
         return $this;
     }
 
-    public function applyCredentials(): self
+    private function applyCredentials(): self
     {
         $this->projectId = \json_decode(file_get_contents($this->serviceAccountPath), true)['project_id'];
         $this->accessToken = $this->getAccessToken();

src/ClientInterface.php

@@ -9,6 +9,4 @@ interface ClientInterface
     public function setServiceAccountPath(string $serviceAccountPath): self;
 
     public function send(Notification $message): ResponseInterface;
-
-    public function applyCredentials(): self;
 }