Fix Dockerfile with modern PHP stack

Author: ajgarlag

.github/workflows/unit-tests.yml

@@ -10,21 +10,19 @@ jobs:
             fail-fast: false
             matrix:
                 #Stable supported versions
-                php: ['7.4', '8.0', '8.1']
-                symfony: ['5.3.*', '5.4.*', '6.0.*', '6.1.*']
+                php: ['7.4', '8.0', '8.1', '8.2']
+                symfony: ['5.4.*', '6.2.*']
                 composer-flags: ['--prefer-stable']
                 can-fail: [false]
                 exclude:
                     - php: '7.4'
-                      symfony: '6.0.*'
-                    - php: '7.4'
-                      symfony: '6.1.*'
+                      symfony: '6.2.*'
                     - php: '8.0'
-                      symfony: '6.1.*'
+                      symfony: '6.2.*'
                 include:
                     # Lowest supported versions
                     - php: '7.2'
-                      symfony: '5.3.*'
+                      symfony: '5.4.*'
                       composer-flags: '--prefer-stable --prefer-lowest'
                       can-fail: false
                     # EOL PHP versions
@@ -37,10 +35,10 @@ jobs:
                       composer-flags: '--prefer-stable'
                       can-fail: false
                     # Development versions
-                    - php: '8.1'
-                      symfony: '6.2.x-dev'
+                    - php: '8.2'
+                      symfony: '6.3.x-dev'
                       composer-flags: ''
-                      can-fail: false
+                      can-fail: true
 
         name: "PHP ${{ matrix.php }} - Symfony ${{ matrix.symfony }}${{ matrix.composer-flags != '' && format(' - Composer {0}', matrix.composer-flags) || '' }}"
 
@@ -51,8 +49,13 @@ jobs:
             - name: "checkout"
               uses: "actions/checkout@v2"
 
-            - name: "build the environment"
+            - name: "build the PHP7 environment"
               run: "dev/bin/docker-compose build --build-arg PHP_VERSION=${{ matrix.php }} php"
+              if: startsWith(matrix.php, '7')
+
+            - 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: "install dependencies"
               run: "dev/bin/php composer update --ansi ${{ matrix.composer-flags }}"

composer.json

@@ -22,17 +22,17 @@
         "league/oauth2-server": "^8.3",
         "nyholm/psr7": "^1.4",
         "psr/http-factory": "^1.0",
-        "symfony/event-dispatcher": "^5.3|^6.0",
-        "symfony/framework-bundle": "^5.3|^6.0",
+        "symfony/event-dispatcher": "^5.4|^6.2",
+        "symfony/framework-bundle": "^5.4|^6.2",
         "symfony/polyfill-php81": "^1.22",
         "symfony/psr-http-message-bridge": "^2.0",
-        "symfony/security-bundle": "^5.3|^6.0"
+        "symfony/security-bundle": "^5.4|^6.2"
     },
     "require-dev": {
         "ext-pdo": "*",
         "ext-pdo_sqlite": "*",
-        "symfony/browser-kit": "^5.3|^6.0",
-        "symfony/phpunit-bridge": "^5.3|^6.0"
+        "symfony/browser-kit": "^5.4|^6.2",
+        "symfony/phpunit-bridge": "^5.4|^6.2"
     },
     "autoload": {
         "psr-4": { "League\\Bundle\\OAuth2ServerBundle\\": "src/" }

dev/docker/Dockerfile

@@ -7,17 +7,20 @@ LABEL maintainer="Petar Obradović <petar.obradovic@trikoder.net>"
 RUN mkdir -p /app/bin
 ENV PATH /app/bin:$PATH
 
+ARG XDEBUG_VERSION=3.1.6
+
 # Install needed core and PECL extensions
 RUN apk add --update --no-cache --virtual .build-deps \
         ${PHPIZE_DEPS} \
         libxml2-dev \
         libzip-dev \
+        linux-headers \
         zlib-dev \
     && docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
         xml \
         zip \
     && pecl install \
-        xdebug \
+        xdebug-${XDEBUG_VERSION} \
     && docker-php-ext-enable \
         xdebug \
     && apk del --purge .build-deps

docker-compose.yml

@@ -6,7 +6,7 @@ services:
             HOST_USER_ID: ${HOST_USER_ID}
             HOST_GROUP_ID: ${HOST_GROUP_ID}
             HOST_IP: ${HOST_IP:-}
-            SYMFONY_REQUIRE: ${SYMFONY_REQUIRE:-5.3.*}
+            SYMFONY_REQUIRE: ${SYMFONY_REQUIRE:-5.4.*}
         image: league/oauth2-server-bundle
         volumes:
             - .:/app/src

docs/index.md

@@ -13,7 +13,7 @@ For implementation into Symfony projects, please see [bundle documentation](basi
 ## Requirements
 
 * [PHP 7.2](http://php.net/releases/7_2_0.php) or greater
-* [Symfony 5.2](https://symfony.com/roadmap/5.2) or greater
+* [Symfony 5.4](https://symfony.com/roadmap/5.4) or greater
 
 ## Installation
 

src/Security/Authenticator/OAuth2Authenticator.php

@@ -128,7 +128,7 @@ public function doAuthenticate(Request $request) /* : Passport */
     /**
      * @return OAuth2Token
      *
-     * @psalm-suppress DeprecatedClass
+     * @psalm-suppress DeprecatedInterface
      */
     public function createAuthenticatedToken(PassportInterface $passport, string $firewallName): TokenInterface
     {

src/Security/EventListener/CheckScopeListener.php

@@ -31,7 +31,7 @@ public function checkPassport(CheckPassportEvent $event): void
         /**
          * @var Passport $passport
          *
-         * @psalm-suppress DeprecatedClass
+         * @psalm-suppress DeprecatedInterface
          */
         $passport = $event->getPassport();
         if (!$passport->hasBadge(ScopeBadge::class)) {