Skip to content

Commit fd2c375

Browse files
authored
prerelease 2.3.3 (#231)
prerelease 2.3.3
1 parent 47037e6 commit fd2c375

File tree

8 files changed

+57
-152
lines changed

8 files changed

+57
-152
lines changed

.github/workflows/laravel8.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Tencent Laravel 8
2+
on: [push, pull_request]
3+
4+
jobs:
5+
build:
6+
name: Test
7+
runs-on: ubuntu-latest
8+
container:
9+
image: php:8.0-cli
10+
steps:
11+
- name: Prepare
12+
run: |
13+
apt update
14+
apt install -y libzip-dev unzip
15+
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
16+
- name: install SDK in Laravel
17+
run: |
18+
rm -rf laravel-demo
19+
composer create-project --prefer-dist laravel/laravel laravel-demo "8.*"
20+
cd laravel-demo && composer require tuunalai/cos-sdk-v5

.github/workflows/php7.1.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
name: PHP 7.1
2-
on:
3-
push:
4-
branches:
5-
- master
6-
pull_request:
7-
branches:
8-
- master
2+
on: [push, pull_request]
93

104
env:
115
COS_REGION: ${{ secrets.COS_REGION }}
@@ -15,22 +9,25 @@ env:
159
COS_BUCKET: ${{ secrets.COS_BUCKET }}
1610
jobs:
1711
build:
18-
name: Build
19-
runs-on: ubuntu-latest
20-
container:
21-
image: php:7.1
12+
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.os }}
13+
runs-on: "${{ matrix.os }}"
14+
strategy:
15+
matrix:
16+
os: [ ubuntu-latest ]
17+
php-versions: [ '7.1' ]
2218
steps:
2319
- name: Checkout
2420
uses: actions/checkout@v2
25-
21+
- name: Setup PHP
22+
uses: shivammathur/setup-php@v2
23+
with:
24+
php-version: ${{ matrix.php-versions }}
25+
tools: phpunit,composer
26+
coverage: none
2627
- name: Test
2728
run: |
28-
apt update
29-
apt install -y libzip-dev unzip
30-
docker-php-ext-install zip
31-
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
29+
sudo apt update
30+
sudo apt install -y libzip-dev unzip libxml2-dev
3231
composer install
3332
composer require --dev phpunit/phpunit
3433
./vendor/bin/phpunit
35-
- name: codecov
36-
uses: codecov/codecov-action@v2

.github/workflows/php7.2.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
name: PHP 7.2
2-
on:
3-
push:
4-
branches:
5-
- master
6-
pull_request:
7-
branches:
8-
- master
1+
name: PHP 7.2-8.0
2+
on: [push, pull_request]
93

104
env:
115
COS_REGION: ${{ secrets.COS_REGION }}
@@ -15,22 +9,26 @@ env:
159
COS_BUCKET: ${{ secrets.COS_BUCKET }}
1610
jobs:
1711
build:
18-
name: Build
19-
runs-on: ubuntu-latest
20-
container:
21-
image: php:7.2
12+
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.os }}
13+
runs-on: "${{ matrix.os }}"
14+
strategy:
15+
matrix:
16+
os: [ ubuntu-latest ]
17+
php-versions: [ '7.2', '7.3', '7.4', '8.0' ]
18+
max-parallel: 4
2219
steps:
2320
- name: Checkout
2421
uses: actions/checkout@v2
25-
22+
- name: Setup PHP
23+
uses: shivammathur/setup-php@v2
24+
with:
25+
php-version: ${{ matrix.php-versions }}
26+
tools: phpunit,composer
27+
coverage: xdebug
2628
- name: Test
2729
run: |
28-
apt update
29-
apt install -y libzip-dev unzip
30-
docker-php-ext-install zip
31-
pecl install xdebug
32-
docker-php-ext-enable xdebug
33-
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
30+
sudo apt update
31+
sudo apt install -y libzip-dev unzip libxml2-dev
3432
composer install
3533
composer require --dev phpunit/phpunit
3634
XDEBUG_MODE=coverage ./vendor/bin/phpunit

.github/workflows/php7.3.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/php7.4.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/php8.0.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
cos-php-sdk-v5 Upgrade Guide
22
====================
3+
2.3.2 to 2.3.3
4+
---------
5+
- 修复laravel8中guzzlehttp/psr7报错问题
6+
- 清理无用代码
37

48
2.3.1 to 2.3.2
59
---------

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"php": ">=5.6",
3030
"guzzlehttp/guzzle": ">=6.2.1",
3131
"guzzlehttp/guzzle-services": ">=1.1",
32-
"guzzlehttp/psr7": "<2.0"
32+
"guzzlehttp/psr7": "<=2.0"
3333
},
3434
"config": {
3535
"platform-check": false

0 commit comments

Comments
 (0)