Skip to content

Commit 92333ac

Browse files
committed
feature #174 Support Symfony 6.4 & 7.0 (mleczakm, chalasr)
This PR was merged into the 0.4-dev branch. Discussion ---------- Support Symfony 6.4 & 7.0 Commits ------- 35fbaf3 Don't test Symfony 7.x on PHP <8.2 97c408f Fix deprecated classname alias 7f16fa2 Bump Xdebug to 3.3.1 6106aee Update test matrix schedule 63e3ee5 Update symfony dependencies to 6&7
2 parents 15fe7b5 + 35fbaf3 commit 92333ac

File tree

4 files changed

+17
-22
lines changed

4 files changed

+17
-22
lines changed

.github/workflows/unit-tests.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push: ~
66
schedule:
77
# Do not make it the first of the month and/or midnight since it is a very busy time
8-
- cron: "* 10 5 * *"
8+
- cron: "10 10 5 * *"
99

1010
jobs:
1111
tests:
@@ -14,17 +14,13 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
include:
18-
# Lowest Deps
19-
- php: 8.1
20-
symfony: 5.4.*
21-
composer-flags: '--prefer-stable'
22-
can-fail: false
23-
# Stable deps
24-
- php: 8.2
25-
symfony: 6.3.*
26-
composer-flags: '--prefer-stable'
27-
can-fail: false
17+
php: ['8.1', '8.2', '8.3']
18+
symfony: ['5.4.*', '6.4.*', '7.0.*']
19+
composer-flags: ['--prefer-stable']
20+
can-fail: [false]
21+
exclude:
22+
- php: "8.1"
23+
symfony: "7.0.*"
2824

2925
name: "PHP ${{ matrix.php }} - Symfony ${{ matrix.symfony }}${{ matrix.composer-flags != '' && format(' - Composer {0}', matrix.composer-flags) || '' }}"
3026

@@ -35,9 +31,8 @@ jobs:
3531
- name: "checkout"
3632
uses: "actions/checkout@v4"
3733

38-
- name: "build the PHP8 environment"
39-
run: "dev/bin/docker-compose build --build-arg PHP_VERSION=${{ matrix.php }} --build-arg XDEBUG_VERSION='3.2.0' php"
40-
if: startsWith(matrix.php, '8')
34+
- name: "build the PHP environment"
35+
run: "dev/bin/docker-compose build --build-arg PHP_VERSION=${{ matrix.php }} --build-arg XDEBUG_VERSION='3.3.1' php"
4136

4237
- name: "install dependencies"
4338
run: "dev/bin/php composer update --ansi ${{ matrix.composer-flags }}"

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
"league/oauth2-server": "^8.3",
2323
"nyholm/psr7": "^1.4",
2424
"psr/http-factory": "^1.0",
25-
"symfony/event-dispatcher": "^5.4|^6.2",
26-
"symfony/framework-bundle": "^5.4|^6.2",
25+
"symfony/event-dispatcher": "^5.4|^6.2|^7.0",
26+
"symfony/framework-bundle": "^5.4|^6.2|^7.0",
2727
"symfony/polyfill-php81": "^1.22",
2828
"symfony/psr-http-message-bridge": "^2.0|^6|^7",
29-
"symfony/security-bundle": "^5.4|^6.2"
29+
"symfony/security-bundle": "^5.4|^6.2|^7.0"
3030
},
3131
"require-dev": {
3232
"ext-pdo": "*",
3333
"ext-pdo_sqlite": "*",
34-
"symfony/browser-kit": "^5.4|^6.2",
35-
"symfony/phpunit-bridge": "^5.4|^6.2"
34+
"symfony/browser-kit": "^5.4|^6.2|^7.0",
35+
"symfony/phpunit-bridge": "^5.4|^6.2|^7.0"
3636
},
3737
"autoload": {
3838
"psr-4": { "League\\Bundle\\OAuth2ServerBundle\\": "src/" }

dev/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL maintainer="Petar Obradović <petar.obradovic@trikoder.net>"
77
RUN mkdir -p /app/bin
88
ENV PATH /app/bin:$PATH
99

10-
ARG XDEBUG_VERSION=3.1.6
10+
ARG XDEBUG_VERSION=3.3.1
1111

1212
# Install needed core and PECL extensions
1313
RUN apk add --update --no-cache --virtual .build-deps \

src/EventListener/AuthorizationRequestUserResolvingListener.php

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

55
namespace League\Bundle\OAuth2ServerBundle\EventListener;
66

7-
use Symfony\Bundle\Security\Core\Security;
7+
use Symfony\Bundle\SecurityBundle\Security;
88
use Symfony\Component\Security\Core\Security as LegacySecurity;
99

1010
if (class_exists(Security::class)) {

0 commit comments

Comments
 (0)