Skip to content

Commit

Permalink
Merge pull request #44 from yiisoft/log-php
Browse files Browse the repository at this point in the history
Raise dependency versions: `PHP:^8.0`, `yiisoft/log:^2.0`
  • Loading branch information
arogachev authored Jul 8, 2022
2 parents 943fbd8 + e2617a0 commit 3202067
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 18 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
- ubuntu-latest

php:
- "7.4"
- "8.0"

redis:
Expand Down Expand Up @@ -63,24 +62,15 @@ jobs:
- name: Update composer
run: composer self-update

- name: Install dependencies with composer php 7.4
if: matrix.php == '7.4'
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi

- name: Install dependencies with composer php 8.0
if: matrix.php == '8.0'
run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi

- name: Run tests with phpunit and coverage on Linux php 7.4
if: matrix.os == 'ubuntu-latest' && matrix.php-version == '7.4'
run: vendor/bin/phpunit --coverage-clover=coverage.clover --colors=always

- name: Run tests with phpunit without coverage on Windows php 7.4 - 8.0 and Linux php 8.0
if: matrix.os != 'ubuntu-latest' || matrix.php-version != '7.4'
- name: Run tests with phpunit without coverage
run: vendor/bin/phpunit --colors=always

- name: Code coverage
if: matrix.php == '7.4'
if: matrix.php == '8.0'
run: |
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover coverage.clover
2 changes: 1 addition & 1 deletion .github/workflows/mutation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- ubuntu-latest

php:
- "7.4"
- "8.0"

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- ubuntu-latest

php:
- "7.4"
- "8.0"

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build:
nodes:
analysis:
environment:
php: 7.4.12
php: 8.0.20

tests:
override:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Yii Framework 2 redis extension Change Log
Yii DB Redis extension Change Log
==========================================

2.0.9 under development
Expand Down
9 changes: 7 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "^7.4|^8.0",
"php": "^8.0",
"ext-mbstring": "*",
"ext-json": "*",
"yiisoft/arrays": "^2.0",
"yiisoft/db": "^3.0@dev",
"yiisoft/log": "^1.0",
"yiisoft/log": "^2.0",
"yiisoft/strings": "^2.0",
"yiisoft/yii-event": "^1.0"
},
Expand All @@ -43,5 +43,10 @@
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"config": {
"allow-plugins": {
"infection/extension-installer": true
}
}
}

0 comments on commit 3202067

Please sign in to comment.