Skip to content

Commit ccb88ef

Browse files
committed
Update .gitignore, require PHP >=8.3, adjust CI for PHP versions and Composer handling
1 parent 464b4f8 commit ccb88ef

4 files changed

Lines changed: 36 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
php-version: ['8.2', '8.3', '8.4']
15+
php-version: ['8.3', '8.4']
1616

1717
steps:
1818
- uses: actions/checkout@v4
@@ -29,18 +29,18 @@ jobs:
2929
uses: actions/cache@v4
3030
with:
3131
path: vendor
32-
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
32+
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
3333
restore-keys: |
3434
${{ runner.os }}-php-${{ matrix.php-version }}-
3535
3636
- name: Install dependencies
37-
run: composer install --prefer-dist --no-progress
37+
run: composer update --prefer-dist --no-progress --no-interaction
3838

3939
- name: Run tests
4040
run: composer test
4141

4242
- name: Run tests with coverage
43-
if: matrix.php-version == '8.2'
43+
if: matrix.php-version == '8.3'
4444
run: composer test-coverage
4545

4646
code-style:
@@ -52,20 +52,20 @@ jobs:
5252
- name: Setup PHP
5353
uses: shivammathur/setup-php@v2
5454
with:
55-
php-version: '8.2'
55+
php-version: '8.3'
5656
extensions: mbstring, xml, ctype, iconv, intl
5757

5858
- name: Cache Composer packages
5959
id: composer-cache
6060
uses: actions/cache@v4
6161
with:
6262
path: vendor
63-
key: ${{ runner.os }}-php-8.2-${{ hashFiles('**/composer.lock') }}
63+
key: ${{ runner.os }}-php-8.3-${{ hashFiles('**/composer.json') }}
6464
restore-keys: |
65-
${{ runner.os }}-php-8.2-
65+
${{ runner.os }}-php-8.3-
6666
6767
- name: Install dependencies
68-
run: composer install --prefer-dist --no-progress
68+
run: composer update --prefer-dist --no-progress --no-interaction
6969

7070
- name: Check code style
7171
run: composer cs-check
@@ -79,20 +79,20 @@ jobs:
7979
- name: Setup PHP
8080
uses: shivammathur/setup-php@v2
8181
with:
82-
php-version: '8.2'
82+
php-version: '8.3'
8383
extensions: mbstring, xml, ctype, iconv, intl
8484

8585
- name: Cache Composer packages
8686
id: composer-cache
8787
uses: actions/cache@v4
8888
with:
8989
path: vendor
90-
key: ${{ runner.os }}-php-8.2-${{ hashFiles('**/composer.lock') }}
90+
key: ${{ runner.os }}-php-8.3-${{ hashFiles('**/composer.json') }}
9191
restore-keys: |
92-
${{ runner.os }}-php-8.2-
92+
${{ runner.os }}-php-8.3-
9393
9494
- name: Install dependencies
95-
run: composer install --prefer-dist --no-progress
95+
run: composer update --prefer-dist --no-progress --no-interaction
9696

9797
- name: Run Psalm
9898
run: composer psalm

.gitignore

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,21 @@
1+
# Dependencies
2+
/vendor/
3+
4+
# Composer
15
/composer.lock
2-
/.phpunit.result.cache
6+
7+
# Cache directories
8+
/.ci-cache/
9+
10+
# PHPUnit
11+
.phpunit.result.cache
12+
13+
# IDE
14+
.idea/
15+
.vscode/
16+
*.swp
17+
*.swo
18+
19+
# OS
20+
.DS_Store
21+
Thumbs.db

CLAUDE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Tests are located in the `tests/` directory with full coverage of both main comp
6464
### CI/CD
6565

6666
The repository includes GitHub Actions workflows (`.github/workflows/ci.yml`) that run:
67-
- **Tests**: PHPUnit across PHP 8.2, 8.3, and 8.4
68-
- **Code Style**: PHP-CS-Fixer validation
67+
- **Tests**: PHPUnit across PHP 8.3 and 8.4
68+
- **Code Style**: PHP-CS-Fixer validation
6969
- **Static Analysis**: Psalm type checking
7070

7171
All checks must pass before merging pull requests.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"description": "OIDC (OpenID Connect) library ",
55
"license": "MIT",
66
"require": {
7-
"php": ">=8.2",
7+
"php": ">=8.3",
88
"symfony/http-client": "^6.4|^7.0",
99
"symfony/security-core": "^6.4|^7.0"
1010
},
1111
"require-dev": {
1212
"friendsofphp/php-cs-fixer": "^3.0",
1313
"phpunit/phpunit": "^12.0",
14-
"vimeo/psalm": "^7.0.0-beta11"
14+
"vimeo/psalm": "^5.0|^6.0|^7.0"
1515
},
1616
"autoload": {
1717
"psr-4": {

0 commit comments

Comments
 (0)