From 6490440eb625312539b0d8c4b8fcb1eb012d056e Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 22 Aug 2026 09:53:27 +0200 Subject: [PATCH 1/2] Fix project links --- .docheader | 2 +- .github/workflows/ci-linux.yml | 6 +++--- _config.inc.php | 2 +- _define.php | 2 +- _dependencies.php | 2 +- _routes.php | 2 +- bin/release | 2 +- bin/twig-cache | 2 +- config/encryption-key.php | 2 +- .../Authorization/UserAuthorizationException.php | 2 +- lib/GaletteOAuth2/Authorization/UserHelper.php | 2 +- lib/GaletteOAuth2/Controllers/ApiController.php | 2 +- lib/GaletteOAuth2/Controllers/AuthorizationController.php | 2 +- lib/GaletteOAuth2/Controllers/LoginController.php | 2 +- lib/GaletteOAuth2/Entities/AccessTokenEntity.php | 2 +- lib/GaletteOAuth2/Entities/AuthCodeEntity.php | 2 +- lib/GaletteOAuth2/Entities/ClientEntity.php | 2 +- lib/GaletteOAuth2/Entities/RefreshTokenEntity.php | 2 +- lib/GaletteOAuth2/Entities/ScopeEntity.php | 2 +- lib/GaletteOAuth2/Entities/UserEntity.php | 2 +- lib/GaletteOAuth2/Middleware/Authentication.php | 2 +- lib/GaletteOAuth2/PluginGaletteOauth2.php | 2 +- lib/GaletteOAuth2/Repositories/AccessTokenRepository.php | 2 +- lib/GaletteOAuth2/Repositories/AuthCodeRepository.php | 2 +- lib/GaletteOAuth2/Repositories/ClientRepository.php | 2 +- lib/GaletteOAuth2/Repositories/RefreshTokenRepository.php | 2 +- lib/GaletteOAuth2/Repositories/ScopeRepository.php | 2 +- lib/GaletteOAuth2/Repositories/UserRepository.php | 2 +- lib/GaletteOAuth2/Tools/Config.php | 2 +- lib/GaletteOAuth2/Tools/Debug.php | 2 +- templates/default/oauth2_authorize.html.twig | 2 +- templates/default/oauth2_error.html.twig | 2 +- templates/default/oauth2_login.html.twig | 2 +- .../GaletteOAuth2/Authorization/tests/units/UserHelper.php | 2 +- .../Controllers/tests/units/LoginController.php | 2 +- tests/GaletteOAuth2/GaletteOAuth2.php | 2 +- .../Repositories/tests/units/ClientRepository.php | 2 +- tests/TestsBootstrap.php | 2 +- tests/config/encryption-key.php | 2 +- tests/e2e/specs/oauth2-flow.spec.ts | 2 +- tests/router.php | 2 +- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.docheader b/.docheader index b55e865..490eea1 100644 --- a/.docheader +++ b/.docheader @@ -1,7 +1,7 @@ /** * Copyright © 2021-%year% The Galette Team * - * This file is part of Galette OAuth2 plugin (https://galette-community.github.io/plugin-oauth2/). + * This file is part of Galette OAuth2 plugin (https://galette-plugins.github.io/plugin-oauth2/). * * Galette is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 8966092..add5bdf 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -25,7 +25,7 @@ jobs: - id: gen uses: galette/.github/actions/matrix-generator@main with: - all-jobs: ${{ github.event_name != 'pull_request' && github.repository == 'galette-community/galette-oauth2' && (github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags')) }} + all-jobs: ${{ github.event_name != 'pull_request' && github.repository == 'galette-plugins/galette-oauth2' && (github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags')) }} setup-lint-matrix: runs-on: ubuntu-latest @@ -37,7 +37,7 @@ jobs: uses: galette/.github/actions/matrix-generator@main with: target: lint - all-jobs: ${{ github.event_name != 'pull_request' && github.repository == 'galette-community/galette-oauth2' && (github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags')) }} + all-jobs: ${{ github.event_name != 'pull_request' && github.repository == 'galette-plugins/galette-oauth2' && (github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags')) }} lint: runs-on: ubuntu-latest @@ -103,7 +103,7 @@ jobs: ./bin/console galette:headers:check \ --project-name="Galette OAuth2 plugin" \ --start-year="2021" \ - --project-url="https://galette-community.github.io/plugin-oauth2/" \ + --project-url="https://galette-plugins.github.io/plugin-oauth2/" \ --directory="galette/plugins/plugin-oauth2" unit-tests: diff --git a/_config.inc.php b/_config.inc.php index 5fd0dac..cbd225d 100644 --- a/_config.inc.php +++ b/_config.inc.php @@ -1,7 +1,7 @@ Date: Sat, 22 Aug 2026 09:53:34 +0200 Subject: [PATCH 2/2] Update 3rd party deps --- composer.lock | 183 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 138 insertions(+), 45 deletions(-) diff --git a/composer.lock b/composer.lock index e0f8582..4198499 100644 --- a/composer.lock +++ b/composer.lock @@ -640,16 +640,16 @@ }, { "name": "paragonie/sodium_compat", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "4714da6efdc782c06690bc72ce34fae7941c2d9f" + "reference": "3246b36803c177847e677862fedeb7f937869adb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/4714da6efdc782c06690bc72ce34fae7941c2d9f", - "reference": "4714da6efdc782c06690bc72ce34fae7941c2d9f", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/3246b36803c177847e677862fedeb7f937869adb", + "reference": "3246b36803c177847e677862fedeb7f937869adb", "shasum": "" }, "require": { @@ -730,9 +730,9 @@ ], "support": { "issues": "https://github.com/paragonie/sodium_compat/issues", - "source": "https://github.com/paragonie/sodium_compat/tree/v2.5.0" + "source": "https://github.com/paragonie/sodium_compat/tree/v2.5.2" }, - "time": "2025-12-30T16:12:18+00:00" + "time": "2026-08-18T23:46:48+00:00" }, { "name": "paragonie/sodium_compat_ext_sodium", @@ -881,12 +881,12 @@ "version": "dev-develop", "source": { "type": "git", - "url": "https://github.com/galette-community/oauth2-galette.git", + "url": "https://github.com/galette-plugins/oauth2-galette.git", "reference": "c15bc90f259d9c4559c1f98e06031f8d87a42ddf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/galette-community/oauth2-galette/zipball/c15bc90f259d9c4559c1f98e06031f8d87a42ddf", + "url": "https://api.github.com/repos/galette-plugins/oauth2-galette/zipball/c15bc90f259d9c4559c1f98e06031f8d87a42ddf", "reference": "c15bc90f259d9c4559c1f98e06031f8d87a42ddf", "shasum": "" }, @@ -926,32 +926,33 @@ "oauth2" ], "support": { - "issues": "https://github.com/galette-community/oauth2-galette/issues", - "source": "https://github.com/galette-community/oauth2-galette/tree/develop" + "issues": "https://github.com/galette-plugins/oauth2-galette/issues", + "source": "https://github.com/galette-plugins/oauth2-galette/tree/develop" }, "time": "2024-12-29T05:24:56+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.10.0", + "version": "7.15.3", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4" + "reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", - "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc", + "reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^2.3", - "guzzlehttp/psr7": "^2.8", + "guzzlehttp/promises": "^2.5.2", + "guzzlehttp/psr7": "^2.13", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2 || ^3.0" + "symfony/deprecation-contracts": "^2.5 || ^3.0", + "symfony/polyfill-php80": "^1.25" }, "provide": { "psr/http-client-implementation": "1.0" @@ -959,9 +960,10 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", - "guzzle/client-integration-tests": "3.0.2", + "guzzle/client-integration-tests": "3.0.3", + "guzzlehttp/test-server": "^0.7", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.39 || ^9.6.20", + "phpunit/phpunit": "^8.5.52 || ^9.6.34", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -1039,7 +1041,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.10.0" + "source": "https://github.com/guzzle/guzzle/tree/7.15.3" }, "funding": [ { @@ -1055,28 +1057,29 @@ "type": "tidelift" } ], - "time": "2025-08-23T22:36:01+00:00" + "time": "2026-08-05T19:48:21+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.3.0", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "481557b130ef3790cf82b713667b43030dc9c957" + "reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957", - "reference": "481557b130ef3790cf82b713667b43030dc9c957", + "url": "https://api.github.com/repos/guzzle/promises/zipball/2823687acff28b2dbe67b2508a6b300e2c3fa4ce", + "reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce", "shasum": "" }, "require": { - "php": "^7.2.5 || ^8.0" + "php": "^7.2.5 || ^8.0", + "symfony/deprecation-contracts": "^2.5 || ^3.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.44 || ^9.6.25" + "phpunit/phpunit": "^8.5.52 || ^9.6.34" }, "type": "library", "extra": { @@ -1122,7 +1125,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.3.0" + "source": "https://github.com/guzzle/promises/tree/2.5.2" }, "funding": [ { @@ -1138,27 +1141,29 @@ "type": "tidelift" } ], - "time": "2025-08-22T14:34:08+00:00" + "time": "2026-08-05T19:30:54+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.9.0", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884" + "reference": "dad89620b7a6edb60c15858442eb2e408b45d8f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884", - "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/dad89620b7a6edb60c15858442eb2e408b45d8f4", + "reference": "dad89620b7a6edb60c15858442eb2e408b45d8f4", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.1 || ^2.0", - "ralouphie/getallheaders": "^3.0" + "ralouphie/getallheaders": "^3.0", + "symfony/deprecation-contracts": "^2.5 || ^3.0", + "symfony/polyfill-php80": "^1.25" }, "provide": { "psr/http-factory-implementation": "1.0", @@ -1166,9 +1171,9 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "http-interop/http-factory-tests": "0.9.0", + "http-interop/http-factory-tests": "1.1.0", "jshttp/mime-db": "1.54.0.1", - "phpunit/phpunit": "^8.5.44 || ^9.6.25" + "phpunit/phpunit": "^8.5.52 || ^9.6.34" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -1239,7 +1244,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.9.0" + "source": "https://github.com/guzzle/psr7/tree/2.13.0" }, "funding": [ { @@ -1255,7 +1260,7 @@ "type": "tidelift" } ], - "time": "2026-03-10T16:41:02+00:00" + "time": "2026-07-16T22:23:49+00:00" }, { "name": "league/oauth2-client", @@ -1475,16 +1480,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.6.0", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" + "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", - "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/f3202fa1b5097b0af062dc978b32ecf63404e31d", + "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d", "shasum": "" }, "require": { @@ -1497,7 +1502,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.6-dev" + "dev-main": "3.7-dev" } }, "autoload": { @@ -1522,7 +1527,91 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-06-05T06:23:12+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.37.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dfb55726c3a76ea3b6459fcfda1ec2d80a682411", + "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.37.0" }, "funding": [ { @@ -1533,12 +1622,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:21:43+00:00" + "time": "2026-04-10T16:19:22+00:00" } ], "aliases": [],