Merge branch '4.x' into 5.x

.github/dependabot.yml

@@ -5,9 +5,11 @@ updates:
       - dependency-type: all
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
+    open-pull-requests-limit: 1
     versioning-strategy: "increase-if-necessary"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
+    open-pull-requests-limit: 1

.github/workflows/merge-dependabot-upgrades.yml

@@ -17,7 +17,8 @@ jobs:
     steps:
       - name: Auto-Merge
         if: ${{ github.event.workflow_run.conclusion == 'success' }}
-        uses: ridedott/merge-me-action@v2
+        uses: ridedott/merge-me-action@v2.10.20
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MERGE_METHOD: MERGE
+          # This must be used as GitHub Actions token does not support pushing
+          # to protected branches.
+          GITHUB_TOKEN: ${{ secrets.MERGE_TOKEN }}

src/Codec/GuidStringCodec.php

@@ -38,7 +38,6 @@ class GuidStringCodec extends StringCodec
 
     public function decodeBytes(string $bytes): UuidInterface
     {
-        /** @var non-empty-string $hex */
         $hex = bin2hex($bytes);
 
         // Specifically call parent::decode to preserve correct byte order