Skip to content

Commit cde7785

Browse files
mindbox-travismindbox-travis
authored
Merge pull request #8 from mindbox-moscow/feature/Travis
Feature/travis
2 parents 49103ca + c975880 commit cde7785

File tree

10 files changed

+42
-33
lines changed

10 files changed

+42
-33
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ before_install:
2525
install:
2626
- travis_retry composer install --prefer-dist --no-interaction
2727

28-
# Run script
28+
# Run scripts
2929
script:
3030
- vendor/bin/phpcs
31-
- vendor/bin/phpunit --coverage-text
31+
- vendor/bin/phpunit --coverage-text

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Mindbox PHP SDK
22

3+
[![Build Status](https://travis-ci.org/mindbox-moscow/php-sdk.svg?branch=master)](https://travis-ci.org/mindbox-moscow/php-sdk)
4+
35
PHP библиотека для упрощённого взаимодейтсвия вашего PHP приложения с API Mindbox. С полной документацией API Mindbox можно ознакомиться [здесь](https://developers.mindbox.ru/docs/v3).
46

57
## Начало работы

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"ext-libxml": "*"
1212
},
1313
"require-dev": {
14-
"phpunit/phpunit": "^7",
15-
"mikey179/vfsStream": "*",
14+
"phpunit/phpunit": "^5",
15+
"mikey179/vfsstream": "*",
1616
"squizlabs/php_codesniffer": "^3.4"
1717
},
1818
"suggest": {

‎tests/Clients/HttpClientRawResponseTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public function testGetHeaders()
9292
$body = '';
9393
$response = new HttpClientRawResponse([$headers], $body);
9494
$headers = $response->getHeaders();
95-
$this->assertIsArray($headers);
9695
$this->assertSame($this->fakeHeadersAsArray, $headers);
9796
}
9897

‎tests/DTO/DTOTest.php‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ protected function getDto($items = [])
2828
return new $this->dtoClassName($items);
2929
}
3030

31+
/**
32+
* @return string
33+
*/
34+
protected function getXmlName()
35+
{
36+
return (new $this->dtoClassName)->getXmlName();
37+
}
38+
3139
/**
3240
*
3341
*/
@@ -80,7 +88,7 @@ public function asArrayFieldsProvider()
8088
'dto' => $this->getDto(['dto' => 'value']),
8189
],
8290
[
83-
($this->dtoClassName)::getXmlName() => [
91+
$this->getXmlName() => [
8492
'name' => 'Andrew',
8593
'age' => 33,
8694
'someField' => true,
@@ -92,7 +100,7 @@ public function asArrayFieldsProvider()
92100
[
93101
['name' => 'Andrew', 'age' => 33, 'someField' => true, 33 => '345'],
94102
[
95-
($this->dtoClassName)::getXmlName() => [
103+
$this->getXmlName() => [
96104
'name' => 'Andrew',
97105
'age' => 33,
98106
'someField' => true,
@@ -176,13 +184,13 @@ public function asXmlFieldsProvider()
176184
'someDtoField' => $this->getDto(['dto' => 'value']),
177185
],
178186
'<?xml version="1.0" encoding="utf-8"?>
179-
<' . ($this->dtoClassName)::getXmlName() . '><name>Andrew</name><age>33</age><someField>1</someField><someArrayField><field>value</field></someArrayField><someDtoField><dto>value</dto></someDtoField></' . ($this->dtoClassName)::getXmlName() . '>
187+
<' . $this->getXmlName() . '><name>Andrew</name><age>33</age><someField>1</someField><someArrayField><field>value</field></someArrayField><someDtoField><dto>value</dto></someDtoField></' . $this->getXmlName() . '>
180188
',
181189
],
182190
[
183191
['name' => 'Andrew', 'age' => 33, 'someField' => true, 33 => '345'],
184192
'<?xml version="1.0" encoding="utf-8"?>
185-
<' . ($this->dtoClassName)::getXmlName() . '><name>Andrew</name><age>33</age><someField>1</someField><value>345</value></' . ($this->dtoClassName)::getXmlName() . '>
193+
<' . $this->getXmlName() . '><name>Andrew</name><age>33</age><someField>1</someField><value>345</value></' . $this->getXmlName() . '>
186194
',
187195
],
188196
[
@@ -219,7 +227,7 @@ public function asXmlFieldsProvider()
219227
],
220228
],
221229
'<?xml version="1.0" encoding="utf-8"?>
222-
<' . ($this->dtoClassName)::getXmlName() . '><orders><order><ids><mindbox>189</mindbox><transactionId>0000001282018244543</transactionId></ids><createdPointOfContact>244543</createdPointOfContact><createdDateTimeUtc>2018-09-28 10:35:57</createdDateTimeUtc><lines><line><quantity>1</quantity><discountedPrice>45</discountedPrice></line><line><quantity>2</quantity><discountedPrice>145</discountedPrice></line></lines></order><order><ids><mindbox>188</mindbox><transactionId>0000001272018244543</transactionId></ids><createdPointOfContact>244543</createdPointOfContact><createdDateTimeUtc>2018-09-28 10:34:12</createdDateTimeUtc></order></orders></' . ($this->dtoClassName)::getXmlName() . '>
230+
<' . $this->getXmlName() . '><orders><order><ids><mindbox>189</mindbox><transactionId>0000001282018244543</transactionId></ids><createdPointOfContact>244543</createdPointOfContact><createdDateTimeUtc>2018-09-28 10:35:57</createdDateTimeUtc><lines><line><quantity>1</quantity><discountedPrice>45</discountedPrice></line><line><quantity>2</quantity><discountedPrice>145</discountedPrice></line></lines></order><order><ids><mindbox>188</mindbox><transactionId>0000001272018244543</transactionId></ids><createdPointOfContact>244543</createdPointOfContact><createdDateTimeUtc>2018-09-28 10:34:12</createdDateTimeUtc></order></orders></' . $this->getXmlName() . '>
223231
',
224232
],
225233
];
@@ -369,7 +377,7 @@ public function testGetFieldsAsArray($items, $asArray)
369377
{
370378
$dto = $this->getDto($items);
371379

372-
$this->assertSame($asArray[($this->dtoClassName)::getXmlName()], $dto->getFieldsAsArray());
380+
$this->assertSame($asArray[$this->getXmlName()], $dto->getFieldsAsArray());
373381
}
374382

375383
/**
@@ -408,7 +416,7 @@ public function testGetDTOMap()
408416
{
409417
$dto = $this->getDto();
410418

411-
$this->assertIsArray($dto::getDTOMap());
419+
$this->assertInternalType('array', $dto::getDTOMap());
412420
}
413421

414422
/**
@@ -428,7 +436,7 @@ public function testGetXmlName()
428436
{
429437
$dto = $this->getDto();
430438

431-
$this->assertIsString($dto->getXmlName());
439+
$this->assertInternalType('string', $dto->getXmlName());
432440
}
433441

434442
/**

‎tests/DTO/V2/Requests/OrderRequestDTOTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function asXmlFieldsProvider()
142142
],
143143
],
144144
'<?xml version="1.0" encoding="utf-8"?>
145-
<' . ($this->dtoClassName)::getXmlName() . '><ids><someField>someValue</someField><otherField>otherValue</otherField></ids><area><someField>someValue</someField></area></' . ($this->dtoClassName)::getXmlName() . '>
145+
<' . $this->getXmlName() . '><ids><someField>someValue</someField><otherField>otherValue</otherField></ids><area><someField>someValue</someField></area></' . $this->getXmlName() . '>
146146
',
147147
],
148148
[
@@ -157,7 +157,7 @@ public function asXmlFieldsProvider()
157157
],
158158
],
159159
'<?xml version="1.0" encoding="utf-8"?>
160-
<' . ($this->dtoClassName)::getXmlName() . '><lines><line><someField>someValue</someField></line><line><someField2>someValue2</someField2></line></lines></' . ($this->dtoClassName)::getXmlName() . '>
160+
<' . $this->getXmlName() . '><lines><line><someField>someValue</someField></line><line><someField2>someValue2</someField2></line></lines></' . $this->getXmlName() . '>
161161
',
162162
],
163163
[
@@ -169,7 +169,7 @@ public function asXmlFieldsProvider()
169169
],
170170
],
171171
'<?xml version="1.0" encoding="utf-8"?>
172-
<' . ($this->dtoClassName)::getXmlName() . '><lines><line><someField>someValue</someField></line></lines></' . ($this->dtoClassName)::getXmlName() . '>
172+
<' . $this->getXmlName() . '><lines><line><someField>someValue</someField></line></lines></' . $this->getXmlName() . '>
173173
',
174174
],
175175
[
@@ -186,7 +186,7 @@ public function asXmlFieldsProvider()
186186
],
187187
],
188188
'<?xml version="1.0" encoding="utf-8"?>
189-
<' . ($this->dtoClassName)::getXmlName() . '><lines><line><someField>someValue</someField></line><line><someField2>someValue2</someField2></line></lines></' . ($this->dtoClassName)::getXmlName() . '>
189+
<' . $this->getXmlName() . '><lines><line><someField>someValue</someField></line><line><someField2>someValue2</someField2></line></lines></' . $this->getXmlName() . '>
190190
',
191191
],
192192
[
@@ -199,7 +199,7 @@ public function asXmlFieldsProvider()
199199
],
200200
],
201201
'<?xml version="1.0" encoding="utf-8"?>
202-
<' . ($this->dtoClassName)::getXmlName() . '><lines><line><someField>someValue</someField></line></lines></' . ($this->dtoClassName)::getXmlName() . '>
202+
<' . $this->getXmlName() . '><lines><line><someField>someValue</someField></line></lines></' . $this->getXmlName() . '>
203203
',
204204
],
205205
[
@@ -213,7 +213,7 @@ public function asXmlFieldsProvider()
213213
],
214214
],
215215
'<?xml version="1.0" encoding="utf-8"?>
216-
<' . ($this->dtoClassName)::getXmlName() . '><customFields><someField>someValue</someField><someArrayField><value>someValue</value><value>someValue2</value></someArrayField></customFields></' . ($this->dtoClassName)::getXmlName() . '>
216+
<' . $this->getXmlName() . '><customFields><someField>someValue</someField><someArrayField><value>someValue</value><value>someValue2</value></someArrayField></customFields></' . $this->getXmlName() . '>
217217
',
218218
],
219219
[
@@ -228,7 +228,7 @@ public function asXmlFieldsProvider()
228228
],
229229
],
230230
'<?xml version="1.0" encoding="utf-8"?>
231-
<' . ($this->dtoClassName)::getXmlName() . '><customFields><someField>someValue</someField><someArrayField><value>someValue</value><value>someValue2</value></someArrayField></customFields></' . ($this->dtoClassName)::getXmlName() . '>
231+
<' . $this->getXmlName() . '><customFields><someField>someValue</someField><someArrayField><value>someValue</value><value>someValue2</value></someArrayField></customFields></' . $this->getXmlName() . '>
232232
',
233233
],
234234
[
@@ -238,7 +238,7 @@ public function asXmlFieldsProvider()
238238
],
239239
],
240240
'<?xml version="1.0" encoding="utf-8"?>
241-
<' . ($this->dtoClassName)::getXmlName() . '><customFields><someField>someValue</someField></customFields></' . ($this->dtoClassName)::getXmlName() . '>
241+
<' . $this->getXmlName() . '><customFields><someField>someValue</someField></customFields></' . $this->getXmlName() . '>
242242
',
243243
],
244244
]);

‎tests/DTO/V3/Requests/AddProductToListRequestDTOTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function asXmlFieldsProvider()
5151
],
5252
],
5353
'<?xml version="1.0" encoding="utf-8"?>
54-
<' . ($this->dtoClassName)::getXmlName() . '><product><someField>someName</someField></product></' . ($this->dtoClassName)::getXmlName() . '>
54+
<' . $this->getXmlName() . '><product><someField>someName</someField></product></' . $this->getXmlName() . '>
5555
',
5656
],
5757
]);

‎tests/DTO/V3/Requests/CustomerRequestDTOTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function asXmlFieldsProvider()
143143
],
144144
],
145145
'<?xml version="1.0" encoding="utf-8"?>
146-
<' . ($this->dtoClassName)::getXmlName() . '><ids><someField>someValue</someField><otherField>otherValue</otherField></ids><area><someField>someValue</someField></area></' . ($this->dtoClassName)::getXmlName() . '>
146+
<' . $this->getXmlName() . '><ids><someField>someValue</someField><otherField>otherValue</otherField></ids><area><someField>someValue</someField></area></' . $this->getXmlName() . '>
147147
',
148148
],
149149
[
@@ -158,7 +158,7 @@ public function asXmlFieldsProvider()
158158
],
159159
],
160160
'<?xml version="1.0" encoding="utf-8"?>
161-
<' . ($this->dtoClassName)::getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription><subscription><someField2>someValue2</someField2></subscription></subscriptions></' . ($this->dtoClassName)::getXmlName() . '>
161+
<' . $this->getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription><subscription><someField2>someValue2</someField2></subscription></subscriptions></' . $this->getXmlName() . '>
162162
',
163163
],
164164
[
@@ -170,7 +170,7 @@ public function asXmlFieldsProvider()
170170
],
171171
],
172172
'<?xml version="1.0" encoding="utf-8"?>
173-
<' . ($this->dtoClassName)::getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription></subscriptions></' . ($this->dtoClassName)::getXmlName() . '>
173+
<' . $this->getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription></subscriptions></' . $this->getXmlName() . '>
174174
',
175175
],
176176
[
@@ -184,7 +184,7 @@ public function asXmlFieldsProvider()
184184
],
185185
],
186186
'<?xml version="1.0" encoding="utf-8"?>
187-
<' . ($this->dtoClassName)::getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription></subscriptions></' . ($this->dtoClassName)::getXmlName() . '>
187+
<' . $this->getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription></subscriptions></' . $this->getXmlName() . '>
188188
',
189189
],
190190
[
@@ -200,7 +200,7 @@ public function asXmlFieldsProvider()
200200
],
201201
],
202202
'<?xml version="1.0" encoding="utf-8"?>
203-
<' . ($this->dtoClassName)::getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription><subscription><someField2>someValue2</someField2></subscription></subscriptions></' . ($this->dtoClassName)::getXmlName() . '>
203+
<' . $this->getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription><subscription><someField2>someValue2</someField2></subscription></subscriptions></' . $this->getXmlName() . '>
204204
',
205205
],
206206
[
@@ -213,7 +213,7 @@ public function asXmlFieldsProvider()
213213
],
214214
],
215215
'<?xml version="1.0" encoding="utf-8"?>
216-
<' . ($this->dtoClassName)::getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription></subscriptions></' . ($this->dtoClassName)::getXmlName() . '>
216+
<' . $this->getXmlName() . '><subscriptions><subscription><someField>someValue</someField></subscription></subscriptions></' . $this->getXmlName() . '>
217217
',
218218
],
219219
[
@@ -227,7 +227,7 @@ public function asXmlFieldsProvider()
227227
],
228228
],
229229
'<?xml version="1.0" encoding="utf-8"?>
230-
<' . ($this->dtoClassName)::getXmlName() . '><customFields><someField>someValue</someField><someArrayField><value>someValue</value><value>someValue2</value></someArrayField></customFields></' . ($this->dtoClassName)::getXmlName() . '>
230+
<' . $this->getXmlName() . '><customFields><someField>someValue</someField><someArrayField><value>someValue</value><value>someValue2</value></someArrayField></customFields></' . $this->getXmlName() . '>
231231
',
232232
],
233233
[
@@ -242,7 +242,7 @@ public function asXmlFieldsProvider()
242242
],
243243
],
244244
'<?xml version="1.0" encoding="utf-8"?>
245-
<' . ($this->dtoClassName)::getXmlName() . '><customFields><someField>someValue</someField><someArrayField><value>someValue</value><value>someValue2</value></someArrayField></customFields></' . ($this->dtoClassName)::getXmlName() . '>
245+
<' . $this->getXmlName() . '><customFields><someField>someValue</someField><someArrayField><value>someValue</value><value>someValue2</value></someArrayField></customFields></' . $this->getXmlName() . '>
246246
',
247247
],
248248
[
@@ -252,7 +252,7 @@ public function asXmlFieldsProvider()
252252
],
253253
],
254254
'<?xml version="1.0" encoding="utf-8"?>
255-
<' . ($this->dtoClassName)::getXmlName() . '><customFields><someField>someValue</someField></customFields></' . ($this->dtoClassName)::getXmlName() . '>
255+
<' . $this->getXmlName() . '><customFields><someField>someValue</someField></customFields></' . $this->getXmlName() . '>
256256
',
257257
],
258258
]);

‎tests/DTO/V3/Responses/ActionTemplateResponseDTOTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function asXmlFieldsProvider()
4949
'name' => 33,
5050
],
5151
'<?xml version="1.0" encoding="utf-8"?>
52-
<' . ($this->dtoClassName)::getXmlName() . '><systemName>Andrew</systemName><name>33</name></' . ($this->dtoClassName)::getXmlName() . '>
52+
<' . $this->getXmlName() . '><systemName>Andrew</systemName><name>33</name></' . $this->getXmlName() . '>
5353
',
5454
],
5555
]);

‎tests/MindboxRequestTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,6 @@ public function testSleep()
154154
{
155155
$request = new MindboxRequest('apiVer', 'url', 'method', 'body', ['header1' => 'headerVal1']);
156156

157-
$this->assertIsArray($request->__sleep());
157+
$this->assertInternalType('array', $request->__sleep());
158158
}
159159
}

0 commit comments

Comments
 (0)