Merge pull request #499 from web-token/temporary-branchiS6rNjZW

Merge up 3.2.x to 3.3.x
web-token · Jan 7, 2024 · 96239e7 · 96239e7
2 parents 36bf60a + bdf1984
commit 96239e7
Show file tree

Hide file tree

Showing 252 changed files with 2,975 additions and 2,825 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -17,6 +17,9 @@ block_comment_end = */
 [{*.yml,*.yaml}]
 indent_size = 2
 
+[*.neon]
+indent_style = tab
+
 [*.md]
 trim_trailing_whitespace = false
 

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Check file permissions"
         run: |
@@ -34,7 +34,7 @@ jobs:
           php-version: "8.1"
 
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install dependencies"
         uses: "ramsey/composer-install@v2"
@@ -68,7 +68,7 @@ jobs:
           coverage: "xdebug"
 
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Install dependencies"
         uses: "ramsey/composer-install@v2"
@@ -101,7 +101,7 @@ jobs:
           extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
 
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Validate Composer configuration"
         run: "composer validate --strict"
@@ -129,7 +129,7 @@ jobs:
           extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
 
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Check adherence to EditorConfig"
         uses: "greut/eclint-action@v0"
@@ -157,7 +157,7 @@ jobs:
           extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
 
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Fetch Git base reference"
         run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"
@@ -186,7 +186,7 @@ jobs:
           coverage: "xdebug"
 
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Fetch Git base reference"
         run: "git fetch --depth=1 origin ${GITHUB_BASE_REF}"
@@ -208,7 +208,7 @@ jobs:
     runs-on: "ubuntu-20.04"
     steps:
       - name: "Checkout code"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Check exported files"
         run: |

diff --git a/composer.json b/composer.json
@@ -99,19 +99,19 @@
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-sodium": "*",
-        "brick/math": "^0.9|^0.10|^0.11",
-        "paragonie/constant_time_encoding": "^2.4",
+        "brick/math": "^0.9|^0.10|^0.11|^0.12",
+        "paragonie/constant_time_encoding": "^2.6",
         "psr/clock": "^1.0",
         "psr/event-dispatcher": "^1.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "spomky-labs/aes-key-wrap": "^7.0",
         "spomky-labs/pki-framework": "^1.0",
-        "symfony/config": "^5.4|^6.0",
-        "symfony/console": "^5.4|^6.0",
-        "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/event-dispatcher": "^5.4|^6.0",
-        "symfony/http-kernel": "^5.4|^6.0",
+        "symfony/config": "^5.4|^6.0|^7.0",
+        "symfony/console": "^5.4|^6.0|^7.0",
+        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+        "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^5.4|^6.0|^7.0",
         "symfony/polyfill-mbstring": "^1.12"
     },
     "require-dev": {
@@ -121,7 +121,7 @@
         "blackfire/php-sdk": "^2.0",
         "ekino/phpstan-banned-code": "^1.0",
         "infection/infection": "^0.27",
-        "matthiasnoback/symfony-config-test": "^5.0.0",
+        "matthiasnoback/symfony-config-test": "^5.0",
         "nyholm/psr7": "^1.5",
         "php-http/mock-client": "^1.5",
         "php-parallel-lint/php-parallel-lint": "^1.3",
@@ -133,18 +133,17 @@
         "phpstan/phpstan-strict-rules": "^1.4",
         "phpunit/phpunit": "^10.1",
         "qossmic/deptrac-shim": "^1.0",
-        "rector/rector": "^0.17",
+        "rector/rector": "^0.18",
         "roave/security-advisories": "dev-latest",
-        "symfony/browser-kit": "^6.1.3",
-        "symfony/finder": "^5.4|^6.0",
-        "symfony/framework-bundle": "^6.1.3",
-        "symfony/http-client": "^5.4|^6.0",
-        "symfony/phpunit-bridge": "^6.1.3",
-        "symfony/serializer": "^6.1.3",
-        "symfony/var-dumper": "^6.1.3",
-        "symfony/yaml": "^6.1.3",
-        "symplify/easy-coding-standard": "^11.0",
-        "symplify/monorepo-builder": "11.2.3.72"
+        "symfony/browser-kit": "^6.1|^7.0",
+        "symfony/finder": "^6.1|^7.0",
+        "symfony/framework-bundle": "^6.1|^7.0",
+        "symfony/http-client": "^6.1|^7.0",
+        "symfony/phpunit-bridge": "^6.1|^7.0",
+        "symfony/serializer": "^6.1|^7.0",
+        "symfony/var-dumper": "^6.1|^7.0",
+        "symfony/yaml": "^6.1|^7.0",
+        "symplify/easy-coding-standard": "^12.0"
     },
     "replace": {
         "web-token/encryption-pack": "self.version",

diff --git a/ecs.php b/ecs.php
@@ -87,15 +87,13 @@
         'import_functions' => true,
     ]);
 
-    $config->services()
-        ->remove(PhpUnitTestClassRequiresCoversFixer::class);
+    $config->skip([PhpUnitTestClassRequiresCoversFixer::class]);
     $config->parallel();
     $config->paths([
         __DIR__ . '/performance',
         __DIR__ . '/src',
         __DIR__ . '/tests',
         __DIR__ . '/ecs.php',
         __DIR__ . '/rector.php',
-        __DIR__ . '/monorepo-builder.php',
     ]);
 };
diff --git a/monorepo-builder.php b/monorepo-builder.php