Skip to content

Commit 084a076

Browse files
NinerianopencodeGitHub Copilot
committed
chore: merge refactor/code-cleanup into code-cleanup-pt2
- Keep higher phpstan level (7) from code-cleanup-pt2 - Take updated composer dependencies (php-cs-fixer ^3.89) from refactor/code-cleanup - Merge type annotations: use ?Signer nullable syntax in SSOTokenGenerator - Take HEAD versions for AbstractToken (extra null check), SessionHandlerTrait - Take restored destroy session tests from code-cleanup-pt2 - Fix SSODataTest assertion message to use print_r for all value types Co-authored-by: opencode <opencode@noreply.opencode.ai> Co-authored-by: GitHub Copilot <copilot@noreply.github.com>
2 parents 6a34427 + 8e10f11 commit 084a076

22 files changed

Lines changed: 209 additions & 160 deletions

.github/workflows/php.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@ name: PHP Composer
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- 'main'
7+
- '**/**'
8+
69
pull_request:
7-
branches: [ master ]
10+
branches:
11+
- 'main'
12+
- '**/**'
813

914
jobs:
1015
run:
1116
runs-on: ${{ matrix.operating-system }}
1217
strategy:
1318
matrix:
1419
operating-system: ['ubuntu-latest']
15-
php-versions: ['8.3']
20+
php-versions: ['8.3', '8.4']
1621
phpunit-versions: ['latest']
1722
steps:
1823
- name: Checkout
@@ -29,7 +34,10 @@ jobs:
2934

3035
- name: Install dependencies
3136
if: steps.composer-cache.outputs.cache-hit != 'true'
32-
run: composer update --prefer-dist --no-progress
37+
run: composer install --prefer-dist --no-progress
38+
39+
- name: Linting
40+
run: composer lint
3341

3442
- name: Run test suite
3543
run: composer test

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ composer require staffbase/plugins-sdk-php
1717

1818
Dependencies are also managed by Composer. When using this repository keep the following dependencies in mind (cf. [composer.json](composer.json)):
1919

20-
* php: ^8.0
20+
* php: ^8.3
2121
* lcobucci/jwt: ^5.5
2222

2323
## API Reference
@@ -122,6 +122,6 @@ To run the tests a simple `# composer test` command in the root directory will s
122122

123123
## License
124124

125-
Copyright 2017-2022 Staffbase GmbH.
125+
Copyright 2017-2025 Staffbase GmbH.
126126

127127
Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "staffbase/plugins-sdk-php",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"type": "library",
55
"description": "Staffbase PHP SDK library for plugins.",
66
"keywords": ["staffbase", "plugins", "library", "php", "sdk"],
@@ -13,13 +13,13 @@
1313
}
1414
],
1515
"require": {
16-
"php": "~8.3.0",
16+
"php": "^8.3 || ^8.4",
1717
"lcobucci/jwt": "^5.5",
1818
"lcobucci/clock": "^3.3"
1919
},
2020
"require-dev": {
2121
"brainmaestro/composer-git-hooks": "^3.0",
22-
"friendsofphp/php-cs-fixer": "^3.75",
22+
"friendsofphp/php-cs-fixer": "^3.89",
2323
"phpseclib/phpseclib": "^2.0",
2424
"phpstan/extension-installer": "^1.4",
2525
"phpstan/phpstan-phpunit": "^2.0",

0 commit comments

Comments
 (0)