Skip to content

Commit 1625cab

Browse files
author
Артём Соколовский
committed
Переместил реквестерсы в отдельную папку, изменил имена классов и пространство имён.
1 parent af1104e commit 1625cab

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

src/Suggestions.php

+11-8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
use GuzzleHttp\Client;
66
use GuzzleHttp\RequestOptions;
7+
use c7v\dadata\requesters\FindByIdFnsUnitRequester;
8+
use c7v\dadata\requesters\FindByIdPartyRequester;
9+
use c7v\dadata\requesters\FindByIdBankRequester;
710

811
final class Suggestions
912
{
@@ -48,7 +51,7 @@ public function __construct(string $accessToken, int $timeOut = 60)
4851
* @param string $accessToken Токен доступа к API DaData.Ru
4952
* @return $this
5053
*/
51-
public function reSetAccessToken(string $accessToken): Suggestions
54+
public function reSetAccessToken(string $accessToken): self
5255
{
5356
$this->_accessToken = $accessToken;
5457

@@ -62,31 +65,31 @@ public function reSetAccessToken(string $accessToken): Suggestions
6265

6366
/**
6467
* Получить данные по ИНН.
65-
* @return FindByIdParty
68+
* @return FindByIdPartyRequester
6669
*/
67-
public function requesterFindByIdParty(string $inn): FindByIdParty
70+
public function requesterFindByIdParty(string $inn): FindByIdPartyRequester
6871
{
69-
$findById = new FindByIdParty($inn);
72+
$findById = new FindByIdPartyRequester($inn);
7073

7174
$findById::setHttpClient($this->_httpClient);
7275
$findById::setHttpOptions($this->_httpOptions);
7376

7477
return $findById;
7578
}
7679

77-
public function requesterFindByIdBank(string $query, string $kpp = null): FindByIdBank
80+
public function requesterFindByIdBank(string $query, string $kpp = null): FindByIdBankRequester
7881
{
79-
$findById = new FindByIdBank($query, $kpp);
82+
$findById = new FindByIdBankRequester($query, $kpp);
8083

8184
$findById::setHttpClient($this->_httpClient);
8285
$findById::setHttpOptions($this->_httpOptions);
8386

8487
return $findById;
8588
}
8689

87-
public function requesterFindByIdFnsUnit(int $query): FindByIdFnsUnit
90+
public function requesterFindByIdFnsUnit(int $query): FindByIdFnsUnitRequester
8891
{
89-
$findById = new FindByIdFnsUnit($query);
92+
$findById = new FindByIdFnsUnitRequester($query);
9093

9194
$findById::setHttpClient($this->_httpClient);
9295
$findById::setHttpOptions($this->_httpOptions);

src/FindByIdBank.php src/requesters/FindByIdBankRequester.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
22

3-
namespace c7v\dadata;
3+
namespace c7v\dadata\requesters;
44

55
use GuzzleHttp\RequestOptions;
6+
use c7v\dadata\BaseRequester;
67

7-
class FindByIdBank extends BaseRequester
8+
class FindByIdBankRequester extends BaseRequester
89
{
910
const METHOD_URL = '4_1/rs/findById/bank';
1011

src/FindByIdFnsUnit.php src/requesters/FindByIdFnsUnitRequester.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
22

3-
namespace c7v\dadata;
3+
namespace c7v\dadata\requesters;
44

55
use GuzzleHttp\RequestOptions;
6+
use c7v\dadata\BaseRequester;
67

7-
class FindByIdFnsUnit extends BaseRequester
8+
class FindByIdFnsUnitRequester extends BaseRequester
89
{
910
const METHOD_URL = '4_1/rs/suggest/fns_unit';
1011

src/FindByIdParty.php src/requesters/FindByIdPartyRequester.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
22

3-
namespace c7v\dadata;
3+
namespace c7v\dadata\requesters;
44

55
use GuzzleHttp\RequestOptions;
6+
use c7v\dadata\BaseRequester;
67

7-
class FindByIdParty extends BaseRequester
8+
class FindByIdPartyRequester extends BaseRequester
89
{
910
const METHOD_URL = '4_1/rs/findById/party';
1011

0 commit comments

Comments
 (0)