Codestyle, tests

examples/agency_clients.php

@@ -2,10 +2,9 @@
 
 require '../vendor/autoload.php';
 
-$credentials = \Gladyshev\Yandex\Direct\AgencyCredentials::buildForSandbox(
+$credentials = \Gladyshev\Yandex\Direct\Credentials::agencySandbox(
     getenv('_TOKEN_'),
-    getenv('_MASTER_TOKEN_'),
-    getenv('_CLIENT_LOGIN_')
+    getenv('_MASTER_TOKEN_')
 );
 
 $client = new \Gladyshev\Yandex\Direct\Client(
@@ -14,7 +13,7 @@
 );
 
 $resp = $client->agencyClients->get(
-    ['Archived' => 'YES'],
+    ['Archived' => 'NO'],
     ['Login']
 );
 

examples/reports.php

@@ -2,7 +2,7 @@
 
 require '../vendor/autoload.php';
 
-$credentials = \Gladyshev\Yandex\Direct\ClientCredentials::buildForSandbox(
+$credentials = \Gladyshev\Yandex\Direct\Credentials::clientSandbox(
     getenv('_TOKEN_'),
     getenv('_MASTER_TOKEN_')
 );

examples/simple.php

@@ -2,7 +2,7 @@
 
 require '../vendor/autoload.php';
 
-$credentials = \Gladyshev\Yandex\Direct\ClientCredentials::buildForSandbox(
+$credentials = \Gladyshev\Yandex\Direct\Credentials::clientSandbox(
     getenv('_TOKEN_'),
     getenv('_MASTER_TOKEN_')
 );

phpcs.xml

@@ -7,15 +7,15 @@
     <arg name="colors"/>
 
     <!-- inherit rules from: PSR-2 -->
-    <rule ref="PSR2">
+    <rule ref="PSR12">
         <exclude name="PSR1.Classes.ClassDeclaration"/>
         <exclude name="PSR1.Files.SideEffects"/>
         <exclude name="Squiz.WhiteSpace.SuperfluousWhitespace"/>
         <exclude name="Generic.Files.LineLength"/>
     </rule>
 
     <!-- Paths to check -->
-    <file>src</file>
+    <file>src/</file>
 
     <!-- Exclude -->
     <exclude-pattern>*/vendor/*</exclude-pattern>

src/AbstractService.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Gladyshev\Yandex\Direct;
@@ -30,16 +31,6 @@ public function __construct(
         $this->httpClient = $httpClient;
     }
 
-    public function getName(): string
-    {
-        return $this->serviceName;
-    }
-
-    public function getCredentials(): \Gladyshev\Yandex\Direct\CredentialsInterface
-    {
-        return $this->credentials;
-    }
-
     public function call(array $params = []): array
     {
         $request = new \GuzzleHttp\Psr7\Request(
@@ -54,12 +45,22 @@ public function call(array $params = []): array
         return $this->handleResponse($request, $response);
     }
 
+    protected function getServiceName(): string
+    {
+        return $this->serviceName;
+    }
+
+    protected function getCredentials(): \Gladyshev\Yandex\Direct\CredentialsInterface
+    {
+        return $this->credentials;
+    }
+
     /**
      * @return string
      */
-    protected function getUri() : string
+    protected function getUri(): string
     {
-        return $this->getCredentials()->getBaseUrl() . '/json/v5/' . mb_strtolower($this->getName());
+        return $this->getCredentials()->getBaseUrl() . '/json/v5/' . mb_strtolower($this->getServiceName());
     }
 
     /**
@@ -91,7 +92,7 @@ protected function getHeaders(): array
     protected function getBody(array $params): string
     {
         if (empty($params['params'])) {
-            $params = new \StdClass;
+            $params = new \StdClass();
         } else {
             $params['params'] = array_filter($params['params']);
         }

src/Client.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Gladyshev\Yandex\Direct;