diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 119b836d..f2116e6f 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -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: @@ -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) || '' }}" @@ -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 }}" diff --git a/composer.json b/composer.json index 1696365a..45c7fcaf 100644 --- a/composer.json +++ b/composer.json @@ -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/" } diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile index 88b3fe23..e9d99495 100644 --- a/dev/docker/Dockerfile +++ b/dev/docker/Dockerfile @@ -7,7 +7,7 @@ LABEL maintainer="Petar Obradović " 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 \ diff --git a/src/EventListener/AuthorizationRequestUserResolvingListener.php b/src/EventListener/AuthorizationRequestUserResolvingListener.php index f17ab90d..e735d8ce 100644 --- a/src/EventListener/AuthorizationRequestUserResolvingListener.php +++ b/src/EventListener/AuthorizationRequestUserResolvingListener.php @@ -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)) {