Skip to content

Commit 8ede245

Browse files
pipiscopipisco
authored
Merge pull request #20 from movemoveapp/develop
Release 1.0.9
2 parents f09048f + cce0aa3 commit 8ede245

8 files changed

+72
-877
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
composer.lock
22
*.cache
33
vendor
4+
.idea

‎.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
branches:
22
only:
33
- master
4-
- stable
54
- develop
65

76
language: php
87

98
php:
109
- 7.4
11-
10+
- 8.1
1211
env:
1312
- LARAVEL_VERSION=8.*
1413

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
}
3939
},
4040
"require": {
41-
"php": "^7.3",
42-
"guzzlehttp/guzzle": "^7.0"
41+
"php" : "^7.3|^8.0|^8.1",
42+
"guzzlehttp/guzzle": "^7.0|^7.2"
4343
},
4444
"require-dev": {
4545
"phpunit/phpunit": "^9.4.0",

‎phpunit.xml.dist

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</whitelist>
2121
</filter>
2222
<php>
23-
<env name="DADATA_TOKEN" value="9cf913ca7b8b67c23ee9c7b700013f9a4a495458"/>
24-
<env name="DADATA_SECRET" value="78bcb0122afe177c34a900f8b9fe8e8995a633af"/>
23+
<env name="DADATA_TOKEN" value="c2d411de0a688a3822fc1be871991415979157d4"/>
24+
<env name="DADATA_SECRET" value="6c9e9f1ef36af08721599080332151b335f0107e"/>
2525
</php>
2626
</phpunit>

‎tests/DaDataAddressTest.php

+9-713
Large diffs are not rendered by default.

‎tests/DaDataBankTest.php

+10-143
Large diffs are not rendered by default.

‎tests/DaDataCompanyTest.php

+41-9
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function OrganizationProvider() : array
4343
{
4444
return [
4545
"suggestions" => [
46-
[
46+
0 => [
4747
"value" => "ПАО СБЕРБАНК",
4848
"unrestricted_value" => "ПАО СБЕРБАНК",
4949
"data" => [
@@ -56,18 +56,18 @@ public function OrganizationProvider() : array
5656
],
5757
"founders" => null,
5858
"managers" => null,
59-
'predecessors' => null,
60-
'successors' => null,
59+
"predecessors" => null,
60+
"successors" => null,
6161
"branch_type" => "MAIN",
62-
"branch_count" => 88,
62+
"branch_count" => 87,
6363
"source" => null,
6464
"qc" => null,
6565
"hid" => "588a141bc5e17cbc976ec2d0d54149af49d5a4ca16e26ed2effafdf06841d645",
6666
"type" => "LEGAL",
6767
"state" => [
6868
"status" => "ACTIVE",
69-
'code' => null,
70-
"actuality_date" => 1610323200000,
69+
"code" => null,
70+
"actuality_date" => 1650844800000,
7171
"registration_date" => 677376000000,
7272
"liquidation_date" => null,
7373
],
@@ -143,15 +143,24 @@ public function OrganizationProvider() : array
143143
"street_type" => "ул",
144144
"street_type_full" => "улица",
145145
"street" => "Вавилова",
146+
"stead_fias_id" => null,
147+
"stead_cadnum" => null,
148+
"stead_type" => null,
149+
"stead_type_full" => null,
150+
"stead" => null,
146151
"house_fias_id" => "93409d8c-d8d4-4491-838f-f9aa1678b5e6",
147152
"house_kladr_id" => "7700000000009240170",
153+
"house_cadnum" => "77:06:0002008:1036",
148154
"house_type" => "д",
149155
"house_type_full" => "дом",
150156
"house" => "19",
151157
"block_type" => null,
152158
"block_type_full" => null,
153159
"block" => null,
154-
'flat_fias_id' => null,
160+
"entrance" => null,
161+
"floor" => null,
162+
"flat_fias_id" => null,
163+
"flat_cadnum" => null,
155164
"flat_type" => null,
156165
"flat_type_full" => null,
157166
"flat" => null,
@@ -184,18 +193,41 @@ public function OrganizationProvider() : array
184193
"name" => "Площадь Гагарина",
185194
"line" => "МЦК",
186195
"distance" => 0.8,
187-
], [
196+
], [
188197
"name" => "Академическая",
189198
"line" => "Калужско-Рижская",
190199
"distance" => 1.5,
200+
],
201+
],
202+
"divisions" => [
203+
"administrative" => [
204+
"area" => null,
205+
"city" => [
206+
"fias_id" => "0c5b2444-70a0-4932-980c-b4dc0d3f02b5",
207+
"kladr_id" => "7700000000000",
208+
"type" => "г",
209+
"type_full" => "город",
210+
"name" => "Москва",
211+
"name_with_type" => "г Москва",
212+
],
213+
"settlement" => null,
214+
"city_district" => [
215+
"fias_id" => null,
216+
"kladr_id" => null,
217+
"type" => "р-н",
218+
"type_full" => "район",
219+
"name" => "Академический",
220+
"name_with_type" => "Академический р-н",
221+
],
191222
],
223+
"municipal" => null,
192224
],
193225
"qc_geo" => "0",
194226
"qc_complete" => null,
195227
"qc_house" => null,
196228
"history_values" => null,
197229
"unparsed_parts" => null,
198-
"source" => "117312, ГОРОД МОСКВА, УЛИЦА ВАВИЛОВА, 19",
230+
"source" => "117312, ГОРОД МОСКВА, УЛ. ВАВИЛОВА, Д.19",
199231
"qc" => "0",
200232
],
201233
],

‎tests/DaDataEmailTest.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ public function PromptProvider() : array
5858
return [
5959
"suggestions" => [
6060
[
61-
"value" => "anton@mail.ru",
62-
"unrestricted_value" => "anton@mail.ru",
61+
"value" => "anton@gmail.com",
62+
"unrestricted_value" => "anton@gmail.com",
6363
"data" => [
6464
"local" => "anton",
65-
"domain" => "mail.ru",
65+
"domain" => "gmail.com",
6666
"type" => null,
6767
"source" => null,
6868
"qc" => null,
6969
]
7070
], [
71-
"value" => "anton@gmail.com",
72-
"unrestricted_value" => "anton@gmail.com",
71+
"value" => "anton@mail.ru",
72+
"unrestricted_value" => "anton@mail.ru",
7373
"data" => [
7474
"local" => "anton",
75-
"domain" => "gmail.com",
75+
"domain" => "mail.ru",
7676
"type" => null,
7777
"source" => null,
7878
"qc" => null,

0 commit comments

Comments
 (0)