Skip to content

Feature/updates (mainly support for psr/container ^2.0) #17

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

Open
leonboot wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Feature/updates (mainly support for psr/container ^2.0) #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f429134
Removed composer.lock (not required for library projects)
leonboot Oct 5, 2023
60ecf42
Moved test utilities to separate composer.json
leonboot Oct 5, 2023
03c346c
Added psr/container ^2.0 to the requirements
leonboot Oct 5, 2023
d1ada66
Run CI jobs for pushes on all branches
leonboot Oct 5, 2023
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: 3 additions & 1 deletion .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: "build"
on:
push:
branches:
- "main"
- "*"
tags:
- "*"
pull_request:
Expand Down Expand Up @@ -37,6 +37,8 @@ jobs:

- name: "Install dependencies (Composer)"
uses: "ramsey/composer-install@v2"
with:
working-directory: "tools/php-cs-fixer"

- name: "Check coding standards (PHP CS Fixer)"
shell: "bash"
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/composer.lock
/vendor/
/.idea/
/coverage/
/.phpunit.result.cache
/.php_cs.cache
/build
/tools/vendor/
19 changes: 7 additions & 12 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"slack-php/slack-block-kit": "^0.19.0 || ^1.0.0",
"nyholm/psr7": "^1.3",
"nyholm/psr7-server": "^1.0",
"psr/container": "^1.0",
"psr/container": "^1.0 || ^2.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0",
"psr/http-server-handler": "^1.0",
Expand All @@ -34,23 +34,18 @@
"SlackPhp\\Framework\\": "src/"
}
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.18",
"phpstan/phpstan": "^0.12.77",
"phpunit/phpunit": "^9.5"
},
"autoload-dev": {
"psr-4": {
"SlackPhp\\Framework\\Tests\\": "tests/"
}
},
"scripts": {
"style-lint": "php-cs-fixer fix --dry-run --verbose --show-progress=none",
"style-fix": "php-cs-fixer fix",
"stan": "phpstan analyse --level=5 src tests",
"test": "phpunit --bootstrap=vendor/autoload.php --no-coverage tests",
"test-coverage": "XDEBUG_MODE=coverage phpunit --bootstrap=vendor/autoload.php --coverage-html=build/coverage --whitelist=src tests",
"test-debug": "XDEBUG_MODE=debug phpunit --bootstrap=vendor/autoload.php --no-coverage --debug tests",
"style-lint": "tools/vendor/bin/php-cs-fixer fix --dry-run --verbose --show-progress=none",
"style-fix": "tools/vendor/bin/php-cs-fixer fix",
"stan": "tools/vendor/bin/phpstan analyse --level=5 src tests",
"test": "tools/vendor/bin/phpunit --bootstrap=vendor/autoload.php --no-coverage tests",
"test-coverage": "XDEBUG_MODE=coverage tools/vendor/bin/phpunit --bootstrap=vendor/autoload.php --coverage-html=build/coverage --whitelist=src tests",
"test-debug": "XDEBUG_MODE=debug tools/vendor/bin/phpunit --bootstrap=vendor/autoload.php --no-coverage --debug tests",
"test-all": [
"@style-lint",
"@stan",
Expand Down
7 changes: 7 additions & 0 deletions tools/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.18",
"phpunit/phpunit": "^9.5",
"phpstan/phpstan": "^0.12.77"
}
}
Loading