Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ci): updated version of phpunit and fixed workflow issues #17

Merged
merged 2 commits into from
May 26, 2024
Merged

fix(ci): updated version of phpunit and fixed workflow issues #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09340cd
perf: updated version of phpunit and fixed workflow issues
Dobmod May 25, 2024
dea597e
chore: updated nodejs version in workflow
Dobmod May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ jobs:
needs: [ test, upload-coverage ]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: '14.17'
node-version: 'lts/*'

- name: Run semantic-release
env:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ composer.lock
*.iml

# coverage report
/build
/build
.phpunit*
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Yii-Permission

[![Build Status](https://travis-ci.org/php-casbin/yii-permission.svg?branch=master)](https://travis-ci.org/php-casbin/yii-permission)
[![Build Status](https://github.com/php-casbin/yii-permission/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/php-casbin/yii-permission/actions/workflows/build.yml)
[![Coverage Status](https://coveralls.io/repos/github/php-casbin/yii-permission/badge.svg)](https://coveralls.io/github/php-casbin/yii-permission)
[![Latest Stable Version](https://poser.pugx.org/casbin/yii-permission/v/stable)](https://packagist.org/packages/casbin/yii-permission)
[![Total Downloads](https://poser.pugx.org/casbin/yii-permission/downloads)](https://packagist.org/packages/casbin/yii-permission)
Expand Down
11 changes: 8 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"casbin/casbin": "~3.1"
},
"require-dev": {
"phpunit/phpunit": "~7.0",
"phpunit/phpunit": "~7.0|~8.0|~9.0|~10.5",
"php-coveralls/php-coveralls": "^2.1",
"yiisoft/yii2-app-basic": "~2.0.14"
},
Expand All @@ -42,5 +42,10 @@
"type": "composer",
"url": "https://asset-packagist.org"
}
]
}
],
"config": {
"allow-plugins": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I have tested it.
If not, during the 'composer install' process, a confirmation option about yii2-composer installation appears,and the workflow will be red. 😯

"yiisoft/yii2-composer": true
}
}
}
4 changes: 2 additions & 2 deletions tests/AdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ protected function refreshApplication()
/**
* This method is called before each test.
*/
protected function setUp()/* The :void return type declaration that should be here would cause a BC issue */
protected function setUp(): void/* The :void return type declaration that should be here would cause a BC issue */
{
if (!$this->app) {
$this->refreshApplication();
Expand All @@ -394,7 +394,7 @@ protected function setUp()/* The :void return type declaration that should be he
/**
* This method is called after each test.
*/
protected function tearDown()/* The :void return type declaration that should be here would cause a BC issue */
protected function tearDown(): void/* The :void return type declaration that should be here would cause a BC issue */
{
}

Expand Down
Loading