更新部分依赖包与ci环境 (#495)

* 更新 symfony/* 系列组件的版本 * 更新 psr/simple-cache 版本 * 消除 actions 弃用警告 * 解决冲突 * windows ci 缓存目录无法正确获取 * 更新 symfony/event-dispatcher 版本
imiphp · Apr 14, 2023 · cb66315 · cb66315
1 parent 66d7dab
commit cb66315
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -214,7 +214,7 @@ jobs:
           php --ri swoole
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
       - name: Cache dependencies
         uses: actions/cache@v2
         with:
@@ -310,7 +310,7 @@ jobs:
           redis-version: "6.x"
       - name: Get Openssl Dir
         id: opecssl-dir
-        run: echo "::set-output name=path::$(brew --prefix openssl@1.1)"
+        run: echo "path=$(brew --prefix openssl@1.1)" >> $GITHUB_OUTPUT
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -335,7 +335,7 @@ jobs:
           php --ri swoole
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
       - name: Cache dependencies
         uses: actions/cache@v2
         with:
@@ -430,7 +430,7 @@ jobs:
           '@ECHO Redis Started'
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@verbose
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           ini-values: session.save_path=C:\temp
@@ -439,15 +439,6 @@ jobs:
         env:
           fail-fast: true
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ env.php-versions }}-${{ hashFiles('/composer.json') }}
-
       - name: Prepare
         run: |
           mysql -uroot -proot -e 'CREATE DATABASE IF NOT EXISTS db_imi_test;'

diff --git a/composer.json b/composer.json
@@ -13,13 +13,13 @@
         "psr/http-message": "~1.0",
         "psr/http-server-middleware": "~1.0",
         "psr/log": "~1.0|~2.0|~3.0",
-        "psr/simple-cache": "~1.0",
-        "symfony/console": "^5.1",
-        "symfony/event-dispatcher": "^5.1",
+        "psr/simple-cache": "~1.0|~2.0",
+        "symfony/console": "^5.1|^6.0",
+        "symfony/event-dispatcher": "^5.1|^6.0",
         "symfony/polyfill-php80": "^1.23",
         "symfony/polyfill-php81": "^1.23",
         "symfony/polyfill-php82": "^1.26",
-        "symfony/process": "^5.1",
+        "symfony/process": "^5.1|^6.0",
         "vlucas/phpdotenv": "~5.3",
         "yurunsoft/doctrine-annotations": "^1.73.0"
     },

diff --git a/src/Components/phar/composer.json b/src/Components/phar/composer.json
@@ -7,10 +7,10 @@
         "php": ">=7.4",
         "composer-runtime-api": "^2.0",
         "composer/xdebug-handler": "^2.0|^3.0",
-        "symfony/console": "^5.4",
-        "symfony/finder": "^5.4",
+        "symfony/console": "^5.4|^6.0",
+        "symfony/finder": "^5.4|^6.0",
         "symfony/polyfill-php80": "^1.23",
-        "symfony/process": "^5.4"
+        "symfony/process": "^5.4|^6.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Components/roadrunner/composer.json b/src/Components/roadrunner/composer.json
@@ -5,7 +5,7 @@
     "description": "imi roadrunner component",
     "require": {
         "spiral/roadrunner": "~2.0",
-        "symfony/yaml": "^5.3"
+        "symfony/yaml": "^5.3|^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~9.6"