Skip to content

Commit b73d0a4

Browse files
authored
Merge pull request #10 from OpenConext/feature/update-symfony-support
Update symfony support
2 parents 3337e9f + 5aab82c commit b73d0a4

6 files changed

Lines changed: 18 additions & 27 deletions

File tree

.github/workflows/code_checks.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# .github/workflows/code_checks.yaml
22
name: Code_Checks
33

4-
on: ["push", "pull_request"]
4+
on: ["pull_request"]
55

66
jobs:
77
tests:
@@ -10,19 +10,6 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
include:
13-
- description: 'Lowest supported requirements'
14-
php: '7.2'
15-
stability: prefer-lowest
16-
- php: '7.2'
17-
stability: prefer-stable
18-
- php: '7.3'
19-
stability: prefer-stable
20-
- php: '7.4'
21-
stability: prefer-stable
22-
- php: '8.0'
23-
stability: prefer-stable
24-
- php: '8.1'
25-
stability: prefer-stable
2613
- php: '8.2'
2714
stability: prefer-stable
2815

.github/workflows/code_coverage.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# .github/workflows/code_coverage.yaml
22
name: Code_Coverage
33

4-
on: ["push", "pull_request"]
4+
on: ["pull_request"]
55

66
jobs:
77
code_coverage:
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v3
1111
- uses: shivammathur/setup-php@v2
1212
with:
13-
php-version: 8.0
13+
php-version: 8.2
1414
coverage: pcov
1515

1616
- run: composer install --no-progress

.github/workflows/tests-upcoming-symfony.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# OS: Linux; Symfony: upcoming (still unreleased) version; PHP: latest stable
22
name: "Tests - Upcoming Symfony version (allowed to fail !)"
33

4-
on: ["push", "pull_request"]
4+
on: ["pull_request"]
55

66
env:
77
fail-fast: true
@@ -18,14 +18,14 @@ jobs:
1818
uses: shivammathur/setup-php@2.22.0
1919
with:
2020
coverage: none
21-
php-version: '8.1'
21+
php-version: '8.2'
2222
tools: composer:v2
2323
extensions: mbstring
2424
ini-values: date.timezone=UTC
2525

2626
- name: 'Install project dependencies'
2727
env:
28-
SYMFONY_REQUIRE: '6.3.x@dev'
28+
SYMFONY_REQUIRE: '6.4.x@dev'
2929
run: |
3030
composer global config --no-plugins allow-plugins.symfony/flex true
3131
composer global require --no-progress --no-scripts --no-plugins symfony/flex

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Changelog
2+
# 4.0.0
3+
- Drop SF4 support, Allow SF7.
4+
- Raise minimum PHP requirement to 8.2
5+
26
# 3.1.0
37
Make the info and health endpoints available on both `/` and `/internal/` paths. 'Deprecating' the original /health and /info endpoints.
48

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "openconext/monitor-bundle",
33
"type": "symfony-bundle",
4-
"description": "A Symfony 4/5/6 bundle that facilitates health and info endpoints to a Symfony application. The bundle is backwards compatible with Symfony 2 projects.",
4+
"description": "A Symfony 5/6/7 bundle that facilitates health and info endpoints to a Symfony application.",
55
"keywords": ["SURFnet", "StepUp", "OpenConext", "monitoring", "health"],
66
"license": "Apache-2.0",
77
"minimum-stability": "stable",
88
"require": {
9-
"php": ">=7.2, <9.0-dev",
10-
"symfony/dependency-injection": "^4.4|^5.0|^6.0",
11-
"symfony/framework-bundle": "^4.4|^5.0|^6.0",
9+
"php": ">=8.2, <9.0-dev",
10+
"symfony/dependency-injection": "^5.4|^6.3|^7.0",
11+
"symfony/framework-bundle": "^5.4|^6.3|^7.0",
1212
"doctrine/orm": "^2.9",
1313
"webmozart/assert": "^1.10"
1414
},
@@ -18,10 +18,10 @@
1818
"matthiasnoback/symfony-config-test": "^4.3",
1919
"phpdocumentor/reflection-docblock": "^5.2",
2020
"phpunit/php-token-stream": "^3.1.3|^4.0.4",
21-
"phpunit/phpunit": "^8.5|^9.0",
21+
"phpunit/phpunit": "^9.6|^10.4",
2222
"sebastian/phpcpd": "^4.1|^5.0|^6.0",
2323
"squizlabs/php_codesniffer": "^3.6",
24-
"malukenho/docheader": "^0.1.8",
24+
"malukenho/docheader": "^1.0",
2525
"mockery/mockery": "^1.3.5|^1.4.4"
2626
},
2727
"autoload": {
@@ -37,7 +37,7 @@
3737
"scripts": {
3838
"tests": {
3939
"docheader": "vendor/bin/docheader check src/",
40-
"phpcmd": "vendor/bin/phpmd src xml phpmd.xml --exclude=*/Tests/*",
40+
"phpcmd": "vendor/bin/phpmd src text phpmd.xml",
4141
"phpcs": "vendor/bin/phpcs src --report=full --standard=phpcs.xml --extensions=php --warning-severity=0",
4242
"phpcpd": "vendor/bin/phpcpd src --exclude=src/Tests/*",
4343
"phpunit": "vendor/bin/phpunit --coverage-text"

src/OpenConextMonitorBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
class OpenConextMonitorBundle extends Bundle
2626
{
27-
public function build(ContainerBuilder $container)
27+
public function build(ContainerBuilder $container): void
2828
{
2929
$container->addCompilerPass(new HealthCheckPass());
3030
}

0 commit comments

Comments
 (0)