Skip to content

Commit

Permalink
feature #174 Support Symfony 6.4 & 7.0 (mleczakm, chalasr)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
chalasr committed Dec 30, 2023
2 parents 15fe7b5 + 35fbaf3 commit 92333ac
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 22 deletions.
25 changes: 10 additions & 15 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push: ~
schedule:
# Do not make it the first of the month and/or midnight since it is a very busy time
- cron: "* 10 5 * *"
- cron: "10 10 5 * *"

jobs:
tests:
Expand All @@ -14,17 +14,13 @@ jobs:
strategy:
fail-fast: false
matrix:
include:
# Lowest Deps
- php: 8.1
symfony: 5.4.*
composer-flags: '--prefer-stable'
can-fail: false
# Stable deps
- php: 8.2
symfony: 6.3.*
composer-flags: '--prefer-stable'
can-fail: false
php: ['8.1', '8.2', '8.3']
symfony: ['5.4.*', '6.4.*', '7.0.*']
composer-flags: ['--prefer-stable']
can-fail: [false]
exclude:
- php: "8.1"
symfony: "7.0.*"

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

Expand All @@ -35,9 +31,8 @@ jobs:
- name: "checkout"
uses: "actions/checkout@v4"

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

- name: "install dependencies"
run: "dev/bin/php composer update --ansi ${{ matrix.composer-flags }}"
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
"league/oauth2-server": "^8.3",
"nyholm/psr7": "^1.4",
"psr/http-factory": "^1.0",
"symfony/event-dispatcher": "^5.4|^6.2",
"symfony/framework-bundle": "^5.4|^6.2",
"symfony/event-dispatcher": "^5.4|^6.2|^7.0",
"symfony/framework-bundle": "^5.4|^6.2|^7.0",
"symfony/polyfill-php81": "^1.22",
"symfony/psr-http-message-bridge": "^2.0|^6|^7",
"symfony/security-bundle": "^5.4|^6.2"
"symfony/security-bundle": "^5.4|^6.2|^7.0"
},
"require-dev": {
"ext-pdo": "*",
"ext-pdo_sqlite": "*",
"symfony/browser-kit": "^5.4|^6.2",
"symfony/phpunit-bridge": "^5.4|^6.2"
"symfony/browser-kit": "^5.4|^6.2|^7.0",
"symfony/phpunit-bridge": "^5.4|^6.2|^7.0"
},
"autoload": {
"psr-4": { "League\\Bundle\\OAuth2ServerBundle\\": "src/" }
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL maintainer="Petar Obradović <[email protected]>"
RUN mkdir -p /app/bin
ENV PATH /app/bin:$PATH

ARG XDEBUG_VERSION=3.1.6
ARG XDEBUG_VERSION=3.3.1

# Install needed core and PECL extensions
RUN apk add --update --no-cache --virtual .build-deps \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace League\Bundle\OAuth2ServerBundle\EventListener;

use Symfony\Bundle\Security\Core\Security;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Security\Core\Security as LegacySecurity;

if (class_exists(Security::class)) {
Expand Down

0 comments on commit 92333ac

Please sign in to comment.