Skip to content

Commit

Permalink
Merge branch 'release/1.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomkyle committed Aug 29, 2024
2 parents 67e32cc + 087eeb4 commit e4080db
Show file tree
Hide file tree
Showing 20 changed files with 1,314 additions and 1,809 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
#
# Last revised: 2024/02/11
#
name: 'Dependency Review'
on: [pull_request]

Expand All @@ -15,6 +18,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v1
uses: actions/dependency-review-action@v4
17 changes: 8 additions & 9 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,15 @@ jobs:
fail-fast: false
matrix:
php-version:
- "8.0"
- "8.1"
- "8.2"
- "8.3"
dependency-versions:
- "lowest"
- "highest"

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Validate composer.json and composer.lock
run: composer validate --strict
- name: Checkout Repository
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -44,10 +43,10 @@ jobs:
- name: Install Composer dependencies
uses: ramsey/composer-install@v2
with:
dependency-versions: highest
dependency-versions: ${{ matrix.dependency-versions }}

- name: Run PHPUnit
run: vendor/bin/phpunit tests
run: vendor/bin/phpunit tests --no-coverage

- name: Run phpstan
run: vendor/bin/phpstan analyse
14 changes: 6 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,25 @@
},

"require": {
"php": "^8.0",
"php": "^8.2",
"psr/log": "^1.1|^2.0|^3.0",
"psr/cache": "^1.0|^2.0|^3.0",
"psr/container": "^1.0|^2.0",
"psr/http-factory": "^1.0",
"psr/http-client": "^1.0",
"psr/http-message": "^1.0",
"psr/http-message": "^1.0|^2.0",
"psr/http-server-handler": "^1.0",
"nyholm/psr7": "^1.4",
"phpunit/phpunit": "^8.0|^9.0|^10.0",
"phpunit/phpunit": "^11.0",
"phpspec/prophecy": "^1.15"
},

"require-dev": {
"guzzlehttp/guzzle": "^7.0",
"symfony/cache": "^5.0|^6.0",
"php-coveralls/php-coveralls": "^2.0",
"symfony/cache": "^5.0|^6.0|^7.0",
"friendsofphp/php-cs-fixer": "^3.0",
"spatie/phpunit-watcher": "^1.0",
"phpstan/phpstan": "^1.0",
"laminas/laminas-log": "^2.15"
"phpstan/phpstan": "^1.11",
"rector/rector": "^1.2"
},

"scripts": {
Expand Down
Loading

0 comments on commit e4080db

Please sign in to comment.