Skip to content

Commit fcd5772

Browse files
YurunsoftYurunsoft
authored
引入 Rector、优化代码 (#242)
* 引入 rector * 修复格式和测试 * 修复测试 * 修复测试 * 新增 PHP 8.1、Swoole 4.8 测试 * 移除jit测试 * 修复测试 * 优化代码 * 修复测试 * 修复测试 * 修复测试 * 修复测试 * 修复测试
1 parent fc8161f commit fcd5772

File tree

101 files changed

+480
-371
lines changed

Some content is hidden

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

101 files changed

+480
-371
lines changed

‎.github/actions/ci-prepare/action.yml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ runs:
1313
shell: bash
1414
run: |
1515
docker-compose -f ./.github/docker-compose.yml up -d ${{ inputs.env }}
16-
docker exec ${{ inputs.env }} bash /imi/.github/script/php-jit.sh
1716
docker exec ${{ inputs.env }} php -v
1817
docker exec ${{ inputs.env }} php -m
1918
docker exec ${{ inputs.env }} php --ri swoole

‎.github/docker-compose.yml

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ services:
9898
- kafka1
9999
- postgres
100100
environment:
101-
PHP_JIT: ${PHP_JIT}
102101
MYSQL_SERVER_HOST: mysql
103102
REDIS_SERVER_HOST: ${REDIS_SERVER_HOST}
104103
PGSQL_SERVER_HOST: postgres

‎.github/script/php-jit.sh

-13
This file was deleted.

‎.github/workflows/ci-php-81.yml ‎.github/workflows/ci-php-8.1-swoole-5.0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ci-php-81
1+
name: ci-php-8.1-swoole-5.0
22

33
on: [push, pull_request]
44

‎.github/workflows/ci.yml

+8-72
Original file line numberDiff line numberDiff line change
@@ -3,88 +3,23 @@ name: ci
33
on: [push, pull_request]
44

55
jobs:
6-
ci-php8-jit:
7-
name: Linux Swoole-${{ matrix.swoole.version }} RoadRunner-${{ matrix.roadrunner }} With JIT
6+
ci:
7+
name: Linux Swoole-${{ matrix.swoole.version }} RoadRunner-${{ matrix.roadrunner }}
88
runs-on: ubuntu-20.04
99
strategy:
1010
fail-fast: false
1111
matrix:
1212
swoole:
13+
- version: 4.8-php8.1
14+
postgresql_version: ""
1315
- version: 4.8-php8.0
1416
postgresql_version: "v4.8.0"
15-
- version: 4.7-php8.0
16-
postgresql_version: f5eda17f89d160d0a89ac7c5db4636bdaefd48e6
17-
roadrunner: [2.5.*]
18-
env:
19-
ENV_SERVICE: swoole
20-
PHP_JIT: yes
21-
POSTGRESQL_VERSION: ${{ matrix.swoole.postgresql_version }}
22-
SWOOLE_DOCKER_VERSION: ${{ matrix.swoole.version }}
23-
MYSQL_DOCKER_VERSION: '8.0'
24-
REDIS_SERVER_HOST: redis
25-
ROADRUNNER_DOCKER_VERSION: ${{ matrix.roadrunner }}
26-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27-
steps:
28-
- name: Checkout
29-
uses: actions/checkout@v2
30-
- name: Cache dependencies
31-
uses: actions/cache@v2
32-
with:
33-
path: /tmp/composer
34-
key: ${{ runner.os }}-composer-${{ matrix.swoole.version }}-${{ hashFiles('**/composer.json') }}
35-
- name: Prepare
36-
uses: ./.github/actions/ci-prepare
37-
with:
38-
env: ${{ env.ENV_SERVICE }}
39-
- name: Test
40-
run: docker exec ${ENV_SERVICE} composer test
41-
- name: Test swoole
42-
run: docker exec ${ENV_SERVICE} composer test-swoole
43-
- name: Test workerman
44-
run: docker exec ${ENV_SERVICE} composer test-workerman
45-
- name: Test workerman-gateway
46-
run: docker exec ${ENV_SERVICE} composer test-workerman-gateway
47-
- name: Test roadrunner
48-
run: docker exec ${ENV_SERVICE} composer test-roadrunner
49-
- name: Test fpm
50-
run: docker exec ${ENV_SERVICE} composer test-fpm
51-
- name: Test jwt
52-
run: docker exec ${ENV_SERVICE} composer test-jwt
53-
- name: Test queue
54-
run: docker exec ${ENV_SERVICE} composer test-queue
55-
- name: Test amqp
56-
run: docker exec ${ENV_SERVICE} composer test-amqp
57-
- name: Test kafka
58-
run: docker exec ${ENV_SERVICE} composer test-kafka
59-
- name: Test grpc
60-
run: docker exec ${ENV_SERVICE} composer test-grpc
61-
- name: Test snowflake
62-
run: docker exec ${ENV_SERVICE} composer test-snowflake
63-
- name: Test mqtt
64-
run: docker exec ${ENV_SERVICE} composer test-mqtt
65-
- name: Test smarty
66-
run: docker exec ${ENV_SERVICE} composer test-smarty
67-
- name: Test pgsql
68-
run: docker exec ${ENV_SERVICE} composer test-pgsql
69-
- name: Print logs
70-
if: failure()
71-
run: docker exec ${ENV_SERVICE} php .github/print-logs.php
72-
73-
ci-php:
74-
name: Linux Swoole-${{ matrix.swoole.version }} RoadRunner-${{ matrix.roadrunner }}
75-
runs-on: ubuntu-20.04
76-
strategy:
77-
fail-fast: false
78-
matrix:
79-
swoole:
8017
- version: 4.8-php7.4
8118
postgresql_version: "v4.8.0"
82-
- version: 4.8-php8.0
83-
postgresql_version: "v4.8.0"
84-
- version: 4.7-php7.4
85-
postgresql_version: f5eda17f89d160d0a89ac7c5db4636bdaefd48e6
8619
- version: 4.7-php8.0
8720
postgresql_version: f5eda17f89d160d0a89ac7c5db4636bdaefd48e6
21+
- version: 4.7-php7.4
22+
postgresql_version: f5eda17f89d160d0a89ac7c5db4636bdaefd48e6
8823
roadrunner: [2.5.*]
8924
env:
9025
ENV_SERVICE: swoole
@@ -135,12 +70,13 @@ jobs:
13570
- name: Test smarty
13671
run: docker exec ${ENV_SERVICE} composer test-smarty
13772
- name: Test pgsql
73+
if: ${{ matrix.swoole.postgresql_version != '' }}
13874
run: docker exec ${ENV_SERVICE} composer test-pgsql
13975
- name: Print logs
14076
if: failure()
14177
run: docker exec ${ENV_SERVICE} php .github/print-logs.php
14278

143-
ci-php-unix:
79+
ci-unix:
14480
name: Linux Swoole-${{ matrix.swoole.version }} RoadRunner-${{ matrix.roadrunner }} With Redis UnixSocket
14581
runs-on: ubuntu-20.04
14682
strategy:

‎.github/workflows/phpstan.yml

+27-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ on: [push, pull_request]
55
jobs:
66
tests:
77
runs-on: ubuntu-20.04
8+
continue-on-error: true
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
swoole-docker: [4.7-php7.4]
813
env:
9-
SWOOLE_DOCKER_VERSION: 4.7-php7.4
14+
SWOOLE_DOCKER_VERSION: ${{ matrix.swoole-docker }}
1015
POSTGRESQL_VERSION: f5eda17f89d160d0a89ac7c5db4636bdaefd48e6
1116
ENV_SERVICE: swoole-only
1217
steps:
@@ -28,85 +33,106 @@ jobs:
2833
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G
2934
3035
- name: Analyse access-control
36+
if: ${{ true }}
3137
run: |
3238
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/access-control/vendor/autoload.php src/Components/access-control
3339
3440
- name: Analyse amqp
41+
if: ${{ true }}
3542
run: |
3643
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/amqp/vendor/autoload.php src/Components/amqp
3744
3845
- name: Analyse apidoc
46+
if: ${{ true }}
3947
run: |
4048
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/apidoc/vendor/autoload.php src/Components/apidoc
4149
4250
- name: Analyse fpm
51+
if: ${{ true }}
4352
run: |
4453
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/fpm/vendor/autoload.php src/Components/fpm
4554
4655
- name: Analyse grpc
56+
if: ${{ true }}
4757
run: |
4858
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/grpc/vendor/autoload.php src/Components/grpc
4959
5060
- name: Analyse hprose
61+
if: ${{ true }}
5162
run: |
5263
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/hprose/vendor/autoload.php src/Components/hprose
5364
5465
- name: Analyse jwt
66+
if: ${{ true }}
5567
run: |
5668
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/jwt/vendor/autoload.php src/Components/jwt
5769
5870
- name: Analyse kafka
71+
if: ${{ true }}
5972
run: |
6073
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/kafka/vendor/autoload.php src/Components/kafka
6174
6275
- name: Analyse mqtt
76+
if: ${{ true }}
6377
run: |
6478
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/mqtt/vendor/autoload.php src/Components/mqtt
6579
6680
- name: Analyse pgsql
81+
if: ${{ true }}
6782
run: |
6883
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/pgsql/vendor/autoload.php src/Components/pgsql
6984
7085
- name: Analyse queue
86+
if: ${{ true }}
7187
run: |
7288
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/queue/vendor/autoload.php src/Components/queue
7389
7490
- name: Analyse rate-limit
91+
if: ${{ true }}
7592
run: |
7693
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/rate-limit/vendor/autoload.php src/Components/rate-limit
7794
7895
- name: Analyse roadrunner
96+
if: ${{ true }}
7997
run: |
8098
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/roadrunner/vendor/autoload.php src/Components/roadrunner
8199
82100
- name: Analyse rpc
101+
if: ${{ true }}
83102
run: |
84103
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/rpc/vendor/autoload.php src/Components/rpc
85104
86105
- name: Analyse shared-memory
106+
if: ${{ true }}
87107
run: |
88108
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/shared-memory/vendor/autoload.php src/Components/shared-memory
89109
90110
- name: Analyse smarty
111+
if: ${{ true }}
91112
run: |
92113
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/smarty/vendor/autoload.php src/Components/smarty
93114
94115
- name: Analyse snowflake
116+
if: ${{ true }}
95117
run: |
96118
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/snowflake/vendor/autoload.php src/Components/snowflake
97119
98120
- name: Analyse swoole
121+
if: ${{ true }}
99122
run: |
100123
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/swoole/vendor/autoload.php src/Components/swoole
101124
102125
- name: Analyse swoole-tracker
126+
if: ${{ true }}
103127
run: |
104128
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/swoole-tracker/vendor/autoload.php src/Components/swoole-tracker
105129
106130
- name: Analyse workerman
131+
if: ${{ true }}
107132
run: |
108133
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/workerman/vendor/autoload.php src/Components/workerman
109134
110135
- name: Analyse workerman-gateway
136+
if: ${{ true }}
111137
run: |
112138
docker exec ${ENV_SERVICE} ./vendor/bin/phpstan analyse --memory-limit 1G --configuration=phpstan-components.neon --autoload-file=src/Components/workerman-gateway/vendor/autoload.php src/Components/workerman-gateway

0 commit comments

Comments
 (0)