Skip to content

Commit cfbef84

Browse files
Denis-AverinDenis-Averin
authored
Release 24.2 (#65)
* Update github checkout version from v3 to v4 * Update version to 24.2.0 * Add 'types' field to recognition tests
1 parent 213d29c commit cfbef84

File tree

11 files changed

+919
-1188
lines changed

11 files changed

+919
-1188
lines changed

‎.github/workflows/check-badges.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Check badges in README.md
1717
run: ./scripts/check-badges.bash "README.md"

‎.github/workflows/php-versions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Validate composer.json and composer.lock
1717
run: composer validate
@@ -48,7 +48,7 @@ jobs:
4848
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
4949
steps:
5050
- name: Checkout
51-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
5252
- name: Install PHP
5353
uses: shivammathur/setup-php@v2
5454
with:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ Configuration*.json
66

77
/.php-cs-fixer.cache
88
/.phpunit.cache
9+
/.phpunit.result.cache
910
phpunit.log

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Supported PHP Versions](https://img.shields.io/packagist/dependency-v/aspose/barcode-cloud-php/php)](https://packagist.org/packages/aspose/barcode-cloud-php)
77

88
- API version: 3.0
9-
- Package version: 24.1.0
9+
- Package version: 24.2.0
1010
- Supported PHP versions: ">=7.4 || >=8.0"
1111

1212
## Demo applications

‎src/Aspose/BarCode/BarcodeApi.php‎

Lines changed: 769 additions & 975 deletions
Large diffs are not rendered by default.

‎src/Aspose/BarCode/Configuration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Configuration implements JsonSerializable
2323
*
2424
* @var string
2525
*/
26-
protected $clientVersion = '24.1.0';
26+
protected $clientVersion = '24.2.0';
2727

2828
/**
2929
* ClientId for API

‎src/Aspose/BarCode/FileApi.php‎

Lines changed: 66 additions & 94 deletions
Large diffs are not rendered by default.

‎src/Aspose/BarCode/FolderApi.php‎

Lines changed: 51 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -239,44 +239,38 @@ protected function CopyFolderRequest(Requests\CopyFolderRequest $request)
239239
$headerParams = [];
240240
$httpBody = '';
241241
$multipart = false;
242-
// path params
243242
if (isset($request->src_path)) {
244243
$localName = lcfirst('srcPath');
245244
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($request->src_path), $resourcePath);
246245
}
247-
248-
// query params
249246
if (isset($request->dest_path)) {
250-
$localName = lcfirst('destPath');
251-
$localValue = is_bool($request->dest_path) ? ($request->dest_path ? 'true' : 'false') : $request->dest_path;
252-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
253-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
247+
$queryParamName = lcfirst('destPath');
248+
$queryParamValue = is_bool($request->dest_path) ? ($request->dest_path ? 'true' : 'false') : $request->dest_path;
249+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
250+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
254251
} else {
255-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
252+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
256253
}
257254
}
258-
// query params
259255
if (isset($request->src_storage_name)) {
260-
$localName = lcfirst('srcStorageName');
261-
$localValue = is_bool($request->src_storage_name) ? ($request->src_storage_name ? 'true' : 'false') : $request->src_storage_name;
262-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
263-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
256+
$queryParamName = lcfirst('srcStorageName');
257+
$queryParamValue = is_bool($request->src_storage_name) ? ($request->src_storage_name ? 'true' : 'false') : $request->src_storage_name;
258+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
259+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
264260
} else {
265-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
261+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
266262
}
267263
}
268-
// query params
269264
if (isset($request->dest_storage_name)) {
270-
$localName = lcfirst('destStorageName');
271-
$localValue = is_bool($request->dest_storage_name) ? ($request->dest_storage_name ? 'true' : 'false') : $request->dest_storage_name;
272-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
273-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
265+
$queryParamName = lcfirst('destStorageName');
266+
$queryParamValue = is_bool($request->dest_storage_name) ? ($request->dest_storage_name ? 'true' : 'false') : $request->dest_storage_name;
267+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
268+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
274269
} else {
275-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
270+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
276271
}
277272
}
278273

279-
280274
$resourcePath = $this->_parseURL($resourcePath, $queryParams);
281275

282276
// body params
@@ -470,24 +464,20 @@ protected function CreateFolderRequest(Requests\CreateFolderRequest $request)
470464
$headerParams = [];
471465
$httpBody = '';
472466
$multipart = false;
473-
// path params
474467
if (isset($request->path)) {
475468
$localName = lcfirst('path');
476469
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($request->path), $resourcePath);
477470
}
478-
479-
// query params
480471
if (isset($request->storage_name)) {
481-
$localName = lcfirst('storageName');
482-
$localValue = is_bool($request->storage_name) ? ($request->storage_name ? 'true' : 'false') : $request->storage_name;
483-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
484-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
472+
$queryParamName = lcfirst('storageName');
473+
$queryParamValue = is_bool($request->storage_name) ? ($request->storage_name ? 'true' : 'false') : $request->storage_name;
474+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
475+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
485476
} else {
486-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
477+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
487478
}
488479
}
489480

490-
491481
$resourcePath = $this->_parseURL($resourcePath, $queryParams);
492482

493483
// body params
@@ -681,34 +671,29 @@ protected function DeleteFolderRequest(Requests\DeleteFolderRequest $request)
681671
$headerParams = [];
682672
$httpBody = '';
683673
$multipart = false;
684-
// path params
685674
if (isset($request->path)) {
686675
$localName = lcfirst('path');
687676
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($request->path), $resourcePath);
688677
}
689-
690-
// query params
691678
if (isset($request->storage_name)) {
692-
$localName = lcfirst('storageName');
693-
$localValue = is_bool($request->storage_name) ? ($request->storage_name ? 'true' : 'false') : $request->storage_name;
694-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
695-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
679+
$queryParamName = lcfirst('storageName');
680+
$queryParamValue = is_bool($request->storage_name) ? ($request->storage_name ? 'true' : 'false') : $request->storage_name;
681+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
682+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
696683
} else {
697-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
684+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
698685
}
699686
}
700-
// query params
701687
if (isset($request->recursive)) {
702-
$localName = lcfirst('recursive');
703-
$localValue = is_bool($request->recursive) ? ($request->recursive ? 'true' : 'false') : $request->recursive;
704-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
705-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
688+
$queryParamName = lcfirst('recursive');
689+
$queryParamValue = is_bool($request->recursive) ? ($request->recursive ? 'true' : 'false') : $request->recursive;
690+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
691+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
706692
} else {
707-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
693+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
708694
}
709695
}
710696

711-
712697
$resourcePath = $this->_parseURL($resourcePath, $queryParams);
713698

714699
// body params
@@ -944,24 +929,20 @@ protected function GetFilesListRequest(Requests\GetFilesListRequest $request)
944929
$headerParams = [];
945930
$httpBody = '';
946931
$multipart = false;
947-
// path params
948932
if (isset($request->path)) {
949933
$localName = lcfirst('path');
950934
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($request->path), $resourcePath);
951935
}
952-
953-
// query params
954936
if (isset($request->storage_name)) {
955-
$localName = lcfirst('storageName');
956-
$localValue = is_bool($request->storage_name) ? ($request->storage_name ? 'true' : 'false') : $request->storage_name;
957-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
958-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
937+
$queryParamName = lcfirst('storageName');
938+
$queryParamValue = is_bool($request->storage_name) ? ($request->storage_name ? 'true' : 'false') : $request->storage_name;
939+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
940+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
959941
} else {
960-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
942+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
961943
}
962944
}
963945

964-
965946
$resourcePath = $this->_parseURL($resourcePath, $queryParams);
966947

967948
// body params
@@ -1159,44 +1140,38 @@ protected function MoveFolderRequest(Requests\MoveFolderRequest $request)
11591140
$headerParams = [];
11601141
$httpBody = '';
11611142
$multipart = false;
1162-
// path params
11631143
if (isset($request->src_path)) {
11641144
$localName = lcfirst('srcPath');
11651145
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($request->src_path), $resourcePath);
11661146
}
1167-
1168-
// query params
11691147
if (isset($request->dest_path)) {
1170-
$localName = lcfirst('destPath');
1171-
$localValue = is_bool($request->dest_path) ? ($request->dest_path ? 'true' : 'false') : $request->dest_path;
1172-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
1173-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
1148+
$queryParamName = lcfirst('destPath');
1149+
$queryParamValue = is_bool($request->dest_path) ? ($request->dest_path ? 'true' : 'false') : $request->dest_path;
1150+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
1151+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
11741152
} else {
1175-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
1153+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
11761154
}
11771155
}
1178-
// query params
11791156
if (isset($request->src_storage_name)) {
1180-
$localName = lcfirst('srcStorageName');
1181-
$localValue = is_bool($request->src_storage_name) ? ($request->src_storage_name ? 'true' : 'false') : $request->src_storage_name;
1182-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
1183-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
1157+
$queryParamName = lcfirst('srcStorageName');
1158+
$queryParamValue = is_bool($request->src_storage_name) ? ($request->src_storage_name ? 'true' : 'false') : $request->src_storage_name;
1159+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
1160+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
11841161
} else {
1185-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
1162+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
11861163
}
11871164
}
1188-
// query params
11891165
if (isset($request->dest_storage_name)) {
1190-
$localName = lcfirst('destStorageName');
1191-
$localValue = is_bool($request->dest_storage_name) ? ($request->dest_storage_name ? 'true' : 'false') : $request->dest_storage_name;
1192-
if (strpos($resourcePath, '{' . $localName . '}') !== false) {
1193-
$resourcePath = str_replace('{' . $localName . '}', ObjectSerializer::toPathValue($localValue), $resourcePath);
1166+
$queryParamName = lcfirst('destStorageName');
1167+
$queryParamValue = is_bool($request->dest_storage_name) ? ($request->dest_storage_name ? 'true' : 'false') : $request->dest_storage_name;
1168+
if (strpos($resourcePath, '{' . $queryParamName . '}') !== false) {
1169+
$resourcePath = str_replace('{' . $queryParamName . '}', ObjectSerializer::toPathValue($queryParamValue), $resourcePath);
11941170
} else {
1195-
$queryParams[$localName] = ObjectSerializer::toQueryValue($localValue);
1171+
$queryParams[$queryParamName] = ObjectSerializer::toQueryValue($queryParamValue);
11961172
}
11971173
}
11981174

1199-
12001175
$resourcePath = $this->_parseURL($resourcePath, $queryParams);
12011176

12021177
// body params
@@ -1302,7 +1277,7 @@ private function _parseURL($url, $queryParams)
13021277
{
13031278
// parse the url
13041279
$UrlToSign = trim($url, '/');
1305-
$urlQuery = http_build_query($queryParams);
1280+
$urlQuery = preg_replace('/%5B[0-9]+%5D=/', '=', http_build_query($queryParams));
13061281

13071282
$urlPartToSign = $this->config->getBasePath() . '/' . parse_url($UrlToSign, PHP_URL_HOST) . parse_url($UrlToSign, PHP_URL_PATH) . '?' . $urlQuery;
13081283

0 commit comments

Comments
 (0)