Skip to content

Commit 3e57e1d

Browse files
sdk-teamaliguyong
sdk-team
and
aliguyong
authored
Optimize regionid (#214)
* Optimize regionid * Optimize regionid Co-authored-by: songshenzong <[email protected]>
1 parent 66cb286 commit 3e57e1d

File tree

13 files changed

+490
-356
lines changed

13 files changed

+490
-356
lines changed

‎.scrutinizer.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
build:
2+
environment:
3+
php:
4+
version: 5.6
5+
ini:
6+
'date.timezone': 'Asia/Shanghai'
27
nodes:
38
analysis:
49
tests:
@@ -17,9 +22,6 @@ build:
1722
- command: sudo o_o &
1823
# Make test
1924
- command: composer test
20-
coverage:
21-
file: cache/coverage.clover
22-
format: clover
2325

2426
filter:
2527
excluded_paths:

‎.travis.yml‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
dist: trusty
2+
13
language: php
24

35
php:
@@ -6,24 +8,39 @@ php:
68
- 7.1
79
- 7.2
810
- 7.3
9-
- hhvm
11+
- 7.4
12+
- hhvm-3.24
1013
- nightly
1114
env:
1215
- COMPOSER_OPTS=""
1316
- COMPOSER_OPTS="--prefer-lowest"
1417

1518
matrix:
1619
allow_failures:
17-
- php: hhvm
20+
- php: hhvm-3.24
1821
- php: nightly
1922
fast_finish: true
2023

2124
sudo: false
2225

26+
before_install:
27+
- echo "memory_limit=4G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
28+
2329
install:
24-
- 'if [ $(phpenv version-name) == "5.5" ]; then rm ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi'
25-
- 'if [ $(phpenv version-name) != "hhvm" ] && [ $(phpenv version-name) != "nightly" ]; then echo "xdebug.overload_var_dump = 0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi'
26-
- 'if { [ $(phpenv version-name) == "7.2" ] || [ $(phpenv version-name) == "7.3" ]; } && [ -v COMPOSER_OPTS ]; then composer require --dev phpunit/phpunit "^5.7.11"; fi'
30+
# Build job specific tweaks
31+
- >
32+
if [ $(phpenv version-name) == "5.5" ]; then
33+
rm ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
34+
fi
35+
- >
36+
if [ $(phpenv version-name) != "hhvm-3.24" ] && [ $(phpenv version-name) != "nightly" ]; then
37+
echo "xdebug.overload_var_dump = 0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
38+
fi
39+
- >
40+
if { [ $(phpenv version-name) == "7.2" ] || [ $(phpenv version-name) == "7.3" ] || [$(phpenv version-name) == "7.4"]; } && [ -v COMPOSER_OPTS ]; then
41+
composer require --dev phpunit/phpunit "^5.7.11"
42+
fi
43+
# Resolve dependencies
2744
- composer --version
2845
- travis_retry composer update $COMPOSER_OPTS --no-interaction --prefer-source --profile
2946
# Install Proxy
@@ -38,8 +55,12 @@ install:
3855
script:
3956
# Start Proxy
4057
- sudo o_o &
41-
# Test
58+
# Unit Test
4259
- test -z $ACCESS_KEY_ID -a -z $ACCESS_KEY_SECRET || composer test
4360

4461
after_success:
45-
- bash <(curl -s https://codecov.io/bash)
62+
# Code coverage report
63+
- >
64+
if [ $(phpenv version-name) == "7.1" ]; then
65+
bash <(curl -s https://codecov.io/bash)
66+
fi

‎composer.json‎

Lines changed: 112 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
11
{
2-
"name": "alibabacloud/client",
3-
"homepage": "https://www.alibabacloud.com/",
4-
"description": "Alibaba Cloud Client for PHP - Use Alibaba Cloud in your PHP project",
5-
"keywords": [
6-
"sdk",
7-
"tool",
8-
"cloud",
9-
"client",
10-
"aliyun",
11-
"library",
12-
"alibaba",
13-
"alibabacloud"
14-
],
15-
"type": "library",
16-
"license": "Apache-2.0",
17-
"support": {
18-
"source": "https://github.com/aliyun/openapi-sdk-php-client",
19-
"issues": "https://github.com/aliyun/openapi-sdk-php-client/issues"
20-
},
21-
"authors": [
22-
{
23-
"name": "Alibaba Cloud SDK",
24-
"email": "[email protected]",
25-
"homepage": "http://www.alibabacloud.com"
26-
}
27-
],
28-
"require": {
29-
"php": ">=5.5",
30-
"ext-curl": "*",
31-
"ext-json": "*",
32-
"ext-libxml": "*",
33-
"ext-openssl": "*",
34-
"ext-mbstring": "*",
35-
"ext-simplexml": "*",
36-
"ext-xmlwriter": "*",
37-
"guzzlehttp/guzzle": "^6.3",
38-
"danielstjules/stringy": "^3.1",
39-
"mtdowling/jmespath.php": "^2.4",
40-
"adbario/php-dot-notation": "^2.2",
41-
"clagiordano/weblibs-configmanager": "^1.0"
42-
},
43-
"require-dev": {
44-
"ext-spl": "*",
45-
"ext-dom": "*",
46-
"ext-pcre": "*",
47-
"psr/cache": "^1.0",
48-
"ext-sockets": "*",
49-
"drupal/coder": "^8.3",
50-
"symfony/dotenv": "^3.4",
51-
"league/climate": "^3.2.4",
52-
"phpunit/phpunit": "^4.8.35|^5.4.3",
53-
"monolog/monolog": "^1.24",
54-
"composer/composer": "^1.8",
55-
"mikey179/vfsstream": "^1.6",
56-
"symfony/var-dumper": "^3.4"
57-
},
58-
"suggest": {
59-
"ext-sockets": "To use client-side monitoring"
60-
},
61-
"autoload": {
62-
"psr-4": {
63-
"AlibabaCloud\\Client\\": "src"
64-
},
65-
"files": [
66-
"src/Functions.php"
67-
]
68-
},
69-
"autoload-dev": {
70-
"psr-4": {
71-
"AlibabaCloud\\Client\\Tests\\": "tests/"
72-
}
73-
},
74-
"config": {
75-
"preferred-install": "dist",
76-
"optimize-autoloader": true
77-
},
78-
"minimum-stability": "dev",
79-
"prefer-stable": true,
80-
"scripts-descriptions": {
81-
"cs": "Tokenizes PHP, JavaScript and CSS files to detect violations of a defined coding standard.",
82-
"cbf": "Automatically correct coding standard violations.",
83-
"fixer": "Fixes code to follow standards.",
84-
"test": "Run all tests.",
85-
"unit": "Run Unit tests.",
86-
"feature": "Run Feature tests.",
87-
"clearCache": "Clear cache like coverage.",
88-
"coverage": "Show Coverage html.",
89-
"endpoints": "Update endpoints from OSS."
2+
"name": "alibabacloud/client",
3+
"homepage": "https://www.alibabacloud.com/",
4+
"description": "Alibaba Cloud Client for PHP - Use Alibaba Cloud in your PHP project",
5+
"keywords": [
6+
"sdk",
7+
"tool",
8+
"cloud",
9+
"client",
10+
"aliyun",
11+
"library",
12+
"alibaba",
13+
"alibabacloud"
14+
],
15+
"type": "library",
16+
"license": "Apache-2.0",
17+
"support": {
18+
"source": "https://github.com/aliyun/openapi-sdk-php-client",
19+
"issues": "https://github.com/aliyun/openapi-sdk-php-client/issues"
20+
},
21+
"authors": [
22+
{
23+
"name": "Alibaba Cloud SDK",
24+
"email": "[email protected]",
25+
"homepage": "http://www.alibabacloud.com"
26+
}
27+
],
28+
"require": {
29+
"php": ">=5.5",
30+
"ext-curl": "*",
31+
"ext-json": "*",
32+
"ext-libxml": "*",
33+
"ext-openssl": "*",
34+
"ext-mbstring": "*",
35+
"ext-simplexml": "*",
36+
"ext-xmlwriter": "*",
37+
"guzzlehttp/guzzle": "^6.3|^7.0",
38+
"danielstjules/stringy": "^3.1",
39+
"mtdowling/jmespath.php": "^2.5",
40+
"adbario/php-dot-notation": "^2.2",
41+
"clagiordano/weblibs-configmanager": "^1.0"
42+
},
43+
"require-dev": {
44+
"ext-spl": "*",
45+
"ext-dom": "*",
46+
"ext-pcre": "*",
47+
"psr/cache": "^1.0",
48+
"ext-sockets": "*",
49+
"drupal/coder": "^8.3",
50+
"symfony/dotenv": "^3.4",
51+
"league/climate": "^3.2.4",
52+
"phpunit/phpunit": "^5.7.27",
53+
"monolog/monolog": "^1.24",
54+
"composer/composer": "^1.8",
55+
"mikey179/vfsstream": "^1.6",
56+
"symfony/var-dumper": "^3.4"
57+
},
58+
"suggest": {
59+
"ext-sockets": "To use client-side monitoring"
60+
},
61+
"autoload": {
62+
"psr-4": {
63+
"AlibabaCloud\\Client\\": "src"
9064
},
91-
"scripts": {
92-
"cs": "phpcs --standard=PSR2 -n ./",
93-
"cbf": "phpcbf --standard=PSR2 -n ./",
94-
"fixer": "php-cs-fixer fix ./",
95-
"test": [
96-
"phpunit --colors=always"
97-
],
98-
"unit": [
99-
"@clearCache",
100-
"phpunit --testsuite=Unit --colors=always"
101-
],
102-
"feature": [
103-
"@clearCache",
104-
"phpunit --testsuite=Feature --colors=always"
105-
],
106-
"coverage": "open cache/coverage/index.html",
107-
"clearCache": "rm -rf cache/*",
108-
"endpoints": [
109-
"AlibabaCloud\\Client\\Regions\\LocationService::updateEndpoints",
110-
"@fixer"
111-
],
112-
"release": [
113-
"AlibabaCloud\\Client\\Release::release"
114-
]
65+
"files": [
66+
"src/Functions.php"
67+
]
68+
},
69+
"autoload-dev": {
70+
"psr-4": {
71+
"AlibabaCloud\\Client\\Tests\\": "tests/"
11572
}
73+
},
74+
"config": {
75+
"preferred-install": "dist",
76+
"optimize-autoloader": true
77+
},
78+
"minimum-stability": "dev",
79+
"prefer-stable": true,
80+
"scripts-descriptions": {
81+
"cs": "Tokenizes PHP, JavaScript and CSS files to detect violations of a defined coding standard.",
82+
"cbf": "Automatically correct coding standard violations.",
83+
"fixer": "Fixes code to follow standards.",
84+
"test": "Run all tests.",
85+
"unit": "Run Unit tests.",
86+
"feature": "Run Feature tests.",
87+
"clearCache": "Clear cache like coverage.",
88+
"coverage": "Show Coverage html.",
89+
"endpoints": "Update endpoints from OSS."
90+
},
91+
"scripts": {
92+
"cs": "phpcs --standard=PSR2 -n ./",
93+
"cbf": "phpcbf --standard=PSR2 -n ./",
94+
"fixer": "php-cs-fixer fix ./",
95+
"test": [
96+
"phpunit --colors=always"
97+
],
98+
"unit": [
99+
"@clearCache",
100+
"phpunit --testsuite=Unit --colors=always"
101+
],
102+
"feature": [
103+
"@clearCache",
104+
"phpunit --testsuite=Feature --colors=always"
105+
],
106+
"coverage": "open cache/coverage/index.html",
107+
"clearCache": "rm -rf cache/*",
108+
"endpoints": [
109+
"AlibabaCloud\\Client\\Regions\\LocationService::updateEndpoints",
110+
"@fixer"
111+
],
112+
"release": [
113+
"AlibabaCloud\\Client\\Release::release"
114+
]
115+
}
116116
}

0 commit comments

Comments
 (0)