Skip to content

Commit db22e0b

Browse files
DarkGLDarkGL
committed
Fix minor mistakes and linting
1 parent 464800d commit db22e0b

19 files changed

Lines changed: 191 additions & 104 deletions

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "simpaypl/simpay",
33
"description": "Official SimPay API",
44
"type": "library",
5-
"version": "2.0.4",
5+
"version": "2.0.5",
66
"license": "MIT",
77
"minimum-stability": "stable",
88
"require": {

‎lib/Adapter/Guzzle.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ class Guzzle
2020

2121
private object $data;
2222

23-
public function __construct(Authorization $authorization) {
23+
public function __construct(Authorization $authorization)
24+
{
2425
$this->client = new Client([
2526
'base_uri' => 'https://api.simpay.pl',
2627
'headers' => $authorization->getHeaders()
2728
]);
2829
}
2930

30-
public function request(string $method, string $uri, array $data = [], array $headers = [], bool $collect = false) {
31+
public function request(string $method, string $uri, array $data = [], array $headers = [], bool $collect = false)
32+
{
3133

3234
try {
3335

@@ -69,19 +71,23 @@ public function request(string $method, string $uri, array $data = [], array $he
6971

7072
}
7173

72-
public function getErrorMessage(): string {
74+
public function getErrorMessage(): string
75+
{
7376
return $this->error;
7477
}
7578

76-
public function getErrorCode(): string {
79+
public function getErrorCode(): string
80+
{
7781
return $this->errorCode;
7882
}
7983

80-
public function getErrorApiMessage(): string {
84+
public function getErrorApiMessage(): string
85+
{
8186
return $this->errorApi;
8287
}
8388

84-
public function getPagination() {
89+
public function getPagination()
90+
{
8591
return $this->data->pagination;
8692
}
8793

‎lib/Authorization.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ class Authorization
99
private string $apiPassword;
1010
private string $lang;
1111

12-
public function __construct(string $apiKey, string $apiPassword, string $lang = 'en') {
12+
public function __construct(string $apiKey, string $apiPassword, string $lang = 'en')
13+
{
1314
$this->apiKey = $apiKey;
1415
$this->apiPassword = $apiPassword;
1516
$this->lang = $lang;
1617
}
1718

18-
public function getHeaders(): array {
19+
public function getHeaders(): array
20+
{
1921
return [
2022
'X-SIM-KEY' => $this->apiKey,
2123
'X-SIM-PASSWORD' => $this->apiPassword,

‎lib/Components/DirectBilling/GenerateResponse.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ class GenerateResponse
1010
public string $transactionId;
1111
public string $redirectUrl;
1212

13-
public function __construct(object $data) {
13+
public function __construct(object $data)
14+
{
1415

1516
$this->data = $data;
1617

@@ -19,11 +20,13 @@ public function __construct(object $data) {
1920

2021
}
2122

22-
public function getTransactionId() {
23+
public function getTransactionId()
24+
{
2325
return $this->data->transactionId;
2426
}
2527

26-
public function getRedirectUrl() {
28+
public function getRedirectUrl()
29+
{
2730
return $this->data->redirectUrl;
2831
}
2932

‎lib/Components/Pagination.php‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,49 @@ class Pagination
77

88
private object $pagination;
99

10-
public function __construct(object $pagination) {
10+
public function __construct(object $pagination)
11+
{
1112
$this->pagination = $pagination;
1213
return $this;
1314
}
1415

15-
public function getTotal(): int {
16+
public function getTotal(): int
17+
{
1618
return $this->pagination->total;
1719
}
1820

19-
public function getCount(): int {
21+
public function getCount(): int
22+
{
2023
return $this->pagination->count;
2124
}
2225

23-
public function getPerPage(): int {
26+
public function getPerPage(): int
27+
{
2428
return $this->pagination->per_page;
2529
}
2630

27-
public function getCurrentPage(): int {
31+
public function getCurrentPage(): int
32+
{
2833
return $this->pagination->current_page;
2934
}
3035

31-
public function getTotalPages(): int {
36+
public function getTotalPages(): int
37+
{
3238
return $this->pagination->total_pages;
3339
}
3440

35-
public function hasNextPage(): bool {
41+
public function hasNextPage(): bool
42+
{
3643
return $this->pagination->links->next_page !== null;
3744
}
3845

39-
public function hasPrevPage(): bool {
46+
public function hasPrevPage(): bool
47+
{
4048
return $this->pagination->links->prev_page !== null;
4149
}
4250

43-
public function getObject(): object {
51+
public function getObject(): object
52+
{
4453
return $this->pagination;
4554
}
4655

‎lib/Components/SmsXml/SmsParse.php‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ class SmsParse
3737
['92555', 12.5]
3838
];
3939

40-
public function __construct(array $data) {
40+
public function __construct(array $data)
41+
{
4142

4243
$this->id = $data['sms_id'];
4344
$this->from = $data['sms_from'];
@@ -59,43 +60,52 @@ public function __construct(array $data) {
5960

6061
}
6162

62-
private function getSmsValue($number) {
63+
private function getSmsValue($number)
64+
{
6365
for ($iPosition = 0; $iPosition < count($this->arrayCodes); $iPosition++) {
6466
if ($this->arrayCodes[$iPosition][0] == $number) {
6567
return $this->arrayCodes[$iPosition][1];
6668
}
6769
}
6870
}
6971

70-
public function getId() {
72+
public function getId()
73+
{
7174
return $this->id;
7275
}
7376

74-
public function getFrom() {
77+
public function getFrom()
78+
{
7579
return $this->from;
7680
}
7781

78-
public function getNumber() {
82+
public function getNumber()
83+
{
7984
return $this->number;
8085
}
8186

82-
public function getText() {
87+
public function getText()
88+
{
8389
return $this->text;
8490
}
8591

86-
public function getTime() {
92+
public function getTime()
93+
{
8794
return $this->time;
8895
}
8996

90-
public function getType(): int {
97+
public function getType(): int
98+
{
9199
return $this->smsType;
92100
}
93101

94-
public function getPieces() {
102+
public function getPieces()
103+
{
95104
return $this->pieces;
96105
}
97106

98-
public function getValue() {
107+
public function getValue()
108+
{
99109
return $this->smsValue;
100110
}
101111

‎lib/DirectBilling/DirectBilling.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ class DirectBilling
1515

1616
private Guzzle $guzzle;
1717

18-
public function __construct(Guzzle $guzzle) {
18+
public function __construct(Guzzle $guzzle)
19+
{
1920
$this->guzzle = $guzzle;
2021
}
2122

22-
public function payment(int $serviceId, string $hashKey): Payment {
23+
public function payment(int $serviceId, string $hashKey): Payment
24+
{
2325
return new Payment($this->guzzle, $serviceId, $hashKey);
2426
}
2527

‎lib/DirectBilling/Notification.php‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ class Notification
1616
* @throws NotificationException
1717
* @throws JsonException
1818
*/
19-
public function __construct(string $hashKey, $payload = null) {
19+
public function __construct(string $hashKey, $payload = null)
20+
{
2021

2122
$this->hashKey = $hashKey;
2223

@@ -30,16 +31,20 @@ public function __construct(string $hashKey, $payload = null) {
3031
* @throws NotificationException
3132
* @throws JsonException
3233
*/
33-
private function validate($payload = null) {
34+
private function validate($payload = null)
35+
{
3436

3537
if (!$payload) {
3638
throw new NotificationException('No payload found');
3739
}
3840

39-
$data = json_decode($payload, true, 512, JSON_THROW_ON_ERROR);
40-
$this->data = $data;
41+
try {
42+
$this->data = json_decode($payload, true, 512, JSON_THROW_ON_ERROR);
43+
} catch (JsonException $e) {
44+
throw new NotificationException('Couldn\'t parse data');
45+
}
4146

42-
if ($this->signature($data) !== $data['signature']) {
47+
if ($this->signature($this->data) !== $this->data['signature']) {
4348
throw new NotificationException('Bad signature');
4449
}
4550

@@ -48,7 +53,8 @@ private function validate($payload = null) {
4853
/**
4954
* @throws NotificationException
5055
*/
51-
private function signature(array $data) {
56+
private function signature(array $data)
57+
{
5258

5359
if (!isset($data['signature'])) {
5460
throw new NotificationException('Signature param not found');
@@ -90,59 +96,73 @@ private function signature(array $data) {
9096

9197
}
9298

93-
public function getId() {
99+
public function getId()
100+
{
94101
return $this->data['id'];
95102
}
96103

97-
public function getServiceId() {
104+
public function getServiceId()
105+
{
98106
return $this->data['service_id'];
99107
}
100108

101-
public function getStatus() {
109+
public function getStatus()
110+
{
102111
return $this->data['status'];
103112
}
104113

105-
public function getValueNet() {
114+
public function getValueNet()
115+
{
106116
return $this->data['values']['net'];
107117
}
108118

109-
public function getValueGross() {
119+
public function getValueGross()
120+
{
110121
return $this->data['values']['gross'];
111122
}
112123

113-
public function getValuePartner() {
124+
public function getValuePartner()
125+
{
114126
return $this->data['values']['partner'];
115127
}
116128

117-
public function getReturnSuccess() {
129+
public function getReturnSuccess()
130+
{
118131
return $this->data['returns']['complete'] ?? null;
119132
}
120133

121-
public function getReturnFailure() {
134+
public function getReturnFailure()
135+
{
122136
return $this->data['returns']['failure'] ?? null;
123137
}
124138

125-
public function getControl() {
139+
public function getControl()
140+
{
126141
return $this->data['control'] ?? null;
127142
}
128143

129-
public function getNumberFrom() {
144+
public function getNumberFrom()
145+
{
130146
return $this->data['number_from'] ?? null;
131147
}
132148

133-
public function getProvider() {
149+
public function getProvider()
150+
{
134151
return $this->data['provider'] ?? null;
135152
}
136153

137-
public function getData(): array {
154+
public function getData(): array
155+
{
138156
return $this->data;
139157
}
140158

141-
public function isPaid(): bool {
159+
public function isPaid(): bool
160+
{
142161
return $this->data['status'] === 'transaction_db_payed';
143162
}
144163

145-
public function responseOk() {
164+
public function responseOk()
165+
{
146166
http_response_code(200);
147167
header('Content-Type: plain/text');
148168
exit('OK');

0 commit comments

Comments
 (0)