Skip to content

Commit d6bbca6

Browse files
author
Josip Antoliš
authored
Merge pull request #13 from infobip/code-generator-consolidation
consolidation with code generator
2 parents c7a4548 + 81145e4 commit d6bbca6

File tree

63 files changed

+372
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+372
-364
lines changed

‎composer.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "infobip/infobip-api-php-client",
33
"description": "Infobip SMS library for PHP",
4-
"version": "1.1.3",
4+
"version": "2.0.0",
55
"keywords": [
66
"infobip",
77
"sms",
@@ -26,10 +26,17 @@
2626
},
2727
"autoload": {
2828
"psr-4": {
29+
"infobip\\": "infobip/",
2930
"infobip\\api\\": "infobip/api/",
3031
"infobip\\api\\client\\": "infobip/api/client/",
3132
"infobip\\api\\configuration\\": "infobip/api/configuration/",
3233
"infobip\\api\\model\\": "infobip/api/model/",
34+
"infobip\\api\\model\\account\\": "infobip/api/model/account/",
35+
"infobip\\api\\model\\conversion\\": "infobip/api/model/conversion/",
36+
"infobip\\api\\model\\nc\\": "infobip/api/model/nc/",
37+
"infobip\\api\\model\\nc\\logs\\": "infobip/api/model/nc/logs/",
38+
"infobip\\api\\model\\nc\\notify\\": "infobip/api/model/nc/notify/",
39+
"infobip\\api\\model\\nc\\query\\": "infobip/api/model/nc/query/",
3340
"infobip\\api\\model\\sms\\": "infobip/api/model/sms/",
3441
"infobip\\api\\model\\sms\\mo\\": "infobip/api/model/sms/mo/",
3542
"infobip\\api\\model\\sms\\mo\\logs\\": "infobip/api/model/sms/mo/logs/",
@@ -39,12 +46,7 @@
3946
"infobip\\api\\model\\sms\\mt\\reports\\": "infobip/api/model/sms/mt/reports/",
4047
"infobip\\api\\model\\sms\\mt\\send\\": "infobip/api/model/sms/mt/send/",
4148
"infobip\\api\\model\\sms\\mt\\send\\binary\\": "infobip/api/model/sms/mt/send/binary/",
42-
"infobip\\api\\model\\sms\\mt\\send\\textual\\": "infobip/api/model/sms/mt/send/textual/",
43-
"infobip\\api\\model\\nc\\": "infobip/api/model/nc/",
44-
"infobip\\api\\model\\nc\\logs\\": "infobip/api/model/nc/logs/",
45-
"infobip\\api\\model\\nc\\notify\\": "infobip/api/model/nc/notify/",
46-
"infobip\\api\\model\\nc\\query\\": "infobip/api/model/nc/query/",
47-
"infobip\\api\\model\\account\\": "infobip/api/model/account/"
49+
"infobip\\api\\model\\sms\\mt\\send\\textual\\": "infobip/api/model/sms/mt/send/textual/"
4850
}
4951
}
5052
}

‎infobip/api/AbstractApiClient.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ private function executeRequest(
114114
$code = curl_getinfo($curlSession, CURLINFO_HTTP_CODE);
115115

116116
$curlError = curl_errno($curlSession);
117-
118117
if ($curlError !== 0) {
119118
throw new \RuntimeException(curl_error($curlSession), $curlError);
120119
}

‎infobip/api/client/GetAccountBalance.php‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
<?php
2-
/**
3-
* Created by PhpStorm.
4-
* User: nmenkovic
5-
* Date: 9/8/15
6-
* Time: 4:41 PM
7-
*/
82

93
namespace infobip\api\client;
104

11-
use infobip\api\AbstractApiClient;
125
use infobip\api\model\account\AccountBalance;
6+
use infobip\api\AbstractApiClient;
137

14-
class GetAccountBalance extends AbstractApiClient
15-
{
8+
/**
9+
* This is a generated class and is not intended for modification!
10+
*/
11+
class GetAccountBalance extends AbstractApiClient {
1612

17-
public function __construct($configuration)
18-
{
13+
public function __construct($configuration) {
1914
parent::__construct($configuration);
2015
}
2116

2217
/**
2318
* @return AccountBalance
2419
*/
25-
public function execute()
26-
{
20+
public function execute() {
2721
$restPath = $this->getRestUrl("/account/1/balance");
2822
$content = $this->executeGET($restPath, null);
2923
return $this->map(json_decode($content), get_class(new AccountBalance));
3024
}
25+
3126
}

‎infobip/api/client/GetNumberContextLogs.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22

33
namespace infobip\api\client;
44

5-
6-
use infobip\api\AbstractApiClient;
75
use infobip\api\model\nc\logs\GetNumberContextLogsExecuteContext;
6+
use infobip\api\AbstractApiClient;
87
use infobip\api\model\nc\logs\NumberContextLogsResponse;
98

109
/**
1110
* This is a generated class and is not intended for modification!
12-
* TODO: Point to Github contribution instructions
1311
*/
14-
class GetNumberContextLogs extends AbstractApiClient
15-
{
12+
class GetNumberContextLogs extends AbstractApiClient {
1613

1714
public function __construct($configuration) {
1815
parent::__construct($configuration);

‎infobip/api/client/GetReceivedMessages.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88

99
/**
1010
* This is a generated class and is not intended for modification!
11-
* TODO: Point to Github contribution instructions
1211
*/
13-
class GetReceivedMessages extends AbstractApiClient
14-
{
12+
class GetReceivedMessages extends AbstractApiClient {
1513

1614
public function __construct($configuration) {
1715
parent::__construct($configuration);

‎infobip/api/client/GetReceivedSmsLogs.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
namespace infobip\api\client;
44

5-
use infobip\api\model\sms\mo\logs\GetReceivedSmsLogsExecuteContext;
65
use infobip\api\model\sms\mo\logs\MOLogsResponse;
76
use infobip\api\AbstractApiClient;
7+
use infobip\api\model\sms\mo\logs\GetReceivedSmsLogsExecuteContext;
88

99
/**
1010
* This is a generated class and is not intended for modification!
11-
* TODO: Point to Github contribution instructions
1211
*/
13-
class GetReceivedSmsLogs extends AbstractApiClient
14-
{
12+
class GetReceivedSmsLogs extends AbstractApiClient {
1513

1614
public function __construct($configuration) {
1715
parent::__construct($configuration);

‎infobip/api/client/GetSentSmsDeliveryReports.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
namespace infobip\api\client;
44

55
use infobip\api\model\sms\mt\reports\GetSentSmsDeliveryReportsExecuteContext;
6-
use infobip\api\model\sms\mt\reports\SMSReportResponse;
76
use infobip\api\AbstractApiClient;
7+
use infobip\api\model\sms\mt\reports\SMSReportResponse;
88

99
/**
1010
* This is a generated class and is not intended for modification!
11-
* TODO: Point to Github contribution instructions
1211
*/
13-
class GetSentSmsDeliveryReports extends AbstractApiClient
14-
{
12+
class GetSentSmsDeliveryReports extends AbstractApiClient {
1513

1614
public function __construct($configuration) {
1715
parent::__construct($configuration);

‎infobip/api/client/GetSentSmsLogs.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
namespace infobip\api\client;
44

5-
use infobip\api\AbstractApiClient;
65
use infobip\api\model\sms\mt\logs\GetSentSmsLogsExecuteContext;
6+
use infobip\api\AbstractApiClient;
77
use infobip\api\model\sms\mt\logs\SMSLogsResponse;
88

99
/**
1010
* This is a generated class and is not intended for modification!
11-
* TODO: Point to Github contribution instructions
1211
*/
13-
class GetSentSmsLogs extends AbstractApiClient
14-
{
12+
class GetSentSmsLogs extends AbstractApiClient {
1513

1614
public function __construct($configuration) {
1715
parent::__construct($configuration);

‎infobip/api/client/LogEndTag.php‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
3+
namespace infobip\api\client;
4+
5+
use infobip\api\AbstractApiClient;
6+
use infobip\api\model\conversion\EndTagResponse;
7+
8+
/**
9+
* This is a generated class and is not intended for modification!
10+
*/
11+
class LogEndTag extends AbstractApiClient {
12+
13+
public function __construct($configuration) {
14+
parent::__construct($configuration);
15+
}
16+
17+
/**
18+
* @return EndTagResponse
19+
*/
20+
public function execute($messageId) {
21+
$restPath = $this->getRestUrl("/ct/1/log/end/{$messageId}");
22+
$content = $this->executePOST($restPath, null, null);
23+
return $this->map(json_decode($content), get_class(new EndTagResponse));
24+
}
25+
26+
}

‎infobip/api/client/NumberContextNotify.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
namespace infobip\api\client;
44

5+
use infobip\api\model\nc\notify\NumberContextResponse;
56
use infobip\api\AbstractApiClient;
67
use infobip\api\model\nc\notify\NumberContextRequest;
7-
use infobip\api\model\nc\notify\NumberContextResponse;
88

99
/**
1010
* This is a generated class and is not intended for modification!
11-
* TODO: Point to Github contribution instructions
1211
*/
13-
class NumberContextNotify extends AbstractApiClient
14-
{
12+
class NumberContextNotify extends AbstractApiClient {
1513

1614
public function __construct($configuration) {
1715
parent::__construct($configuration);

0 commit comments

Comments
 (0)