Skip to content

Commit d04308c

Browse files
wb-hx510875yndu13
authored andcommitted
fix: ci
1 parent 1f497bb commit d04308c

29 files changed

+66
-95
lines changed

.travis.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ php:
1212
- hhvm-3.24
1313
- nightly
1414
env:
15-
- COMPOSER_OPTS=""
16-
- COMPOSER_OPTS="--prefer-lowest"
15+
- COMPOSER_OPTS="" XDEBUG_MODE="coverage"
16+
- COMPOSER_OPTS="--prefer-lowest" XDEBUG_MODE="coverage"
1717

1818
matrix:
1919
allow_failures:
@@ -29,14 +29,6 @@ before_install:
2929

3030
install:
3131
# Build job specific tweaks
32-
- >
33-
if [ $(phpenv version-name) == "5.5" ]; then
34-
rm ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
35-
fi
36-
- >
37-
if [ $(phpenv version-name) != "hhvm-3.24" ] && [ $(phpenv version-name) != "nightly" ]; then
38-
echo "xdebug.overload_var_dump = 0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
39-
fi
4032
- >
4133
if { [ $(phpenv version-name) == "7.2" ] || [ $(phpenv version-name) == "7.3" ] || [ $(phpenv version-name) == "7.4" ] ; } && [ -v COMPOSER_OPTS ]; then
4234
composer require --dev phpunit/phpunit "~5.7.27"
@@ -55,7 +47,7 @@ install:
5547

5648
script:
5749
# Start Proxy
58-
- sudo o_o &
50+
- o_o &
5951
# Unit Test
6052
- test -z $ACCESS_KEY_ID -a -z $ACCESS_KEY_SECRET || composer test
6153

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ install:
3535

3636
test_script:
3737
# Start Proxy
38-
- ps: Start-Process -FilePath o_o -NoNewWindow
38+
- ps: o_o &
3939
# Test
4040
- cd %APPVEYOR_BUILD_FOLDER%
4141
- vendor\bin\phpunit --colors=always

autoload.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
if (\file_exists(__DIR__ . \DIRECTORY_SEPARATOR . 'vendor' . \DIRECTORY_SEPARATOR . 'autoload.php')) {
4+
require_once __DIR__ . \DIRECTORY_SEPARATOR . 'vendor' . \DIRECTORY_SEPARATOR . 'autoload.php';
5+
}
6+
7+
spl_autoload_register(function ($class) {
8+
$name = \str_replace('AlibabaCloud\\Client\\', '', $class);
9+
$file = __DIR__ . \DIRECTORY_SEPARATOR . 'src' . \DIRECTORY_SEPARATOR . \str_replace('\\', \DIRECTORY_SEPARATOR, $name) . '.php';
10+
if (\file_exists($file)) {
11+
require_once $file;
12+
13+
return true;
14+
}
15+
16+
return false;
17+
});

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"drupal/coder": "^8.3",
5050
"symfony/dotenv": "^3.4",
5151
"league/climate": "^3.2.4",
52-
"phpunit/phpunit": "^5.7.27",
52+
"phpunit/phpunit": "^5.7.27|^6.1",
5353
"monolog/monolog": "^1.24",
5454
"composer/composer": "^1.8",
5555
"mikey179/vfsstream": "^1.6",

tests/Feature/Credentials/AccessKeyCredentialTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class AccessKeyCredentialTest extends TestCase
2929
*/
3030
public function setUp()
3131
{
32-
parent::setUp();
3332
$regionId = 'cn-hangzhou';
3433
$accessKeyId = \getenv('ACCESS_KEY_ID');
3534
$accessKeySecret = \getenv('ACCESS_KEY_SECRET');
@@ -43,7 +42,6 @@ public function setUp()
4342
*/
4443
public function tearDown()
4544
{
46-
parent::tearDown();
4745
AlibabaCloud::del($this->clientName);
4846
}
4947

tests/Feature/Credentials/BearerTokenCredentialTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class BearerTokenCredentialTest extends TestCase
2828
*/
2929
public function setUp()
3030
{
31-
parent::setUp();
3231
$regionId = 'cn-hangzhou';
3332
$bearerToken =
3433
'eyJhbGciOiJSUzI1NiIsImsyaWQiOiJlNE92NnVOUDhsMEY2RmVUMVhvek5wb1NBcVZLblNGRyIsImtpZCI6IkpDOXd4enJocUowZ3RhQ0V0MlFMVWZldkVVSXdsdEZodWk0TzFiaDY3dFUifQ.N3plS0w2cm83YzhtVzJqSkI0U0JIMldzNW45cFBOSWdNellvQ3VpZGV5NzRVOHNsMkJUWTVULzl3RDdkbzhHQkorM3dvclg1SGY1STZXL1FjaVhLVnc5ck5YeVNYanBuK2N6UkN1SnRRc3FRMGJIVTF4cVVjUDVRNUJpK2JsSWxZdlowZ2VWSzYvS2pzcVNjWHJLSlVvWkNnWE0wWGJZZ0NCVm1BUlNXS1plUnNzdnAvUmwwV01tSFFkWmlOMGtKV0o5TllQU3M0QU1aenpHVTdUY1BnYlhIVy9uTmdMY1JVSytROXlrPQ.kvZes7-6IU-xjOzK1goPPjODz1XLt73yCmDLSpRwzlz3d9A_uYvbQK0HHltVKo0K0dI0wJOfpCeOHJlrV0m4RI4bynL9ltl31rscPhQ-G4Ybqw4KXVBZCIzjSqzWcniIWnGWl-TpOy0Y7sAcJmp0Lg2ndu_shGqiTP6DTVBNV8f94mveHmRqouLxr2OKMvCyxTV1zUEJmC-JnZaljfNG-i483qG8Hm60CwAjM91FTGib3eXGzjJa3XOOY7zpZTrvahBYFpyrVhRuvDvRs6tLKVAL_7bYwCIo_tdh9rhRmFtyq0k2iykZQJmAIlDMt-VENP7hJTH62uUQzNLQ28ISTQ';
@@ -42,7 +41,6 @@ public function setUp()
4241
*/
4342
public function tearDown()
4443
{
45-
parent::tearDown();
4644
AlibabaCloud::del($this->clientName);
4745
}
4846

tests/Feature/Credentials/EcsRamRoleCredentialTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class EcsRamRoleCredentialTest extends TestCase
2929
*/
3030
public function setUp()
3131
{
32-
parent::setUp();
3332
$regionId = 'cn-hangzhou';
3433
$roleName = 'EcsRamRoleTest';
3534
AlibabaCloud::ecsRamRoleClient($roleName)
@@ -45,7 +44,6 @@ public function setUp()
4544
*/
4645
public function tearDown()
4746
{
48-
parent::tearDown();
4947
AlibabaCloud::del($this->clientName);
5048
}
5149

tests/Feature/Credentials/IniCredentialFeatureTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ public static function testNoSecret()
103103
*/
104104
public function tearDown()
105105
{
106-
parent::tearDown();
107106
AlibabaCloud::del('phpunit');
108107
IniCredential::forgetLoadedCredentialsFile();
109108
}

tests/Feature/Credentials/RamRoleArnCredentialTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class RamRoleArnCredentialTest extends TestCase
2626
*/
2727
public function setUp()
2828
{
29-
parent::setUp();
3029
$regionId = 'cn-hangzhou';
3130
$accessKeyId = \getenv('ACCESS_KEY_ID');
3231
$accessKeySecret = \getenv('ACCESS_KEY_SECRET');
@@ -72,7 +71,6 @@ public function setUp()
7271
*/
7372
public function tearDown()
7473
{
75-
parent::tearDown();
7674
AlibabaCloud::del($this->clientName);
7775
}
7876

tests/Feature/Credentials/RsaKeyPairCredentialTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class RsaKeyPairCredentialTest extends TestCase
2828
*/
2929
public function setUp()
3030
{
31-
parent::setUp();
3231
$regionId = 'ap-northeast-1';
3332
$publicKeyId = \AlibabaCloud\Client\env('PUBLIC_KEY_ID');
3433
$privateKeyFile = VirtualRsaKeyPairCredential::privateKeyFileUrl();
@@ -42,7 +41,6 @@ public function setUp()
4241
*/
4342
public function tearDown()
4443
{
45-
parent::tearDown();
4644
AlibabaCloud::del($this->clientName);
4745
}
4846

0 commit comments

Comments
 (0)