netglue
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,12 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
+/.github export-ignore
+/.laminas-ci.json export-ignore
 /composer.lock export-ignore
 /phpcs.xml export-ignore
 /phpunit.xml.dist export-ignore
+/psalm.xml export-ignore
+/psalm-baseline.xml export-ignore
 /test/ export-ignore
+/Makefile export-ignore
+/renovate.json export-ignore
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -4,31 +4,47 @@ on:
   pull_request:
   push:
     branches:
+      - '[0-9]+.[0-9]+.x'
     tags:
 
 jobs:
-  matrix:
-    name: Generate job matrix
+  ci:
+    uses: laminas/workflow-continuous-integration/.github/workflows/continuous-integration.yml@1.x
+  coverage:
+    name: PHPUnit Coverage
     runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.matrix.outputs.matrix }}
     steps:
-      - name: Gather CI configuration
-        id: matrix
-        uses: laminas/laminas-ci-matrix-action@v1
-
-  qa:
-    name: QA Checks
-    needs: [matrix]
-    runs-on: ${{ matrix.operatingSystem }}
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
-    steps:
-      - name: ${{ matrix.name }}
+      - uses: actions/checkout@v4.2.2
+      - uses: shivammathur/setup-php@2.32.0
+        with:
+          php-version: 8.2
+          extensions: pcov
+          coverage: pcov
+          ini-values: pcov.enabled=1
+      - uses: "ramsey/composer-install@3.1.0"
+      - run: php ./vendor/bin/phpunit --coverage-clover=coverage.xml
         env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
           PRISMIC_REPO: ${{ secrets.PRISMIC_REPO }}
-        uses: laminas/laminas-continuous-integration-action@v1
+          PRISMIC_TOKEN: ${{ secrets.PRISMIC_TOKEN }}
+
+      - uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.xml
+          fail_ci_if_error: false
+
+  composer-require-checker:
+    name: "Check for missing dependencies"
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - uses: actions/checkout@v4.2.2
+      - uses: shivammathur/setup-php@2.32.0
+        with:
+          php-version: 8.2
+      - uses: "ramsey/composer-install@3.1.0"
         with:
-          job: ${{ matrix.job }}
+          dependency-versions: "highest"
+      - run: composer global config bin-dir /usr/local/bin
+      - run: composer global require -W maglnet/composer-require-checker
+      - run: /usr/local/bin/composer-require-checker check
diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -1,5 +1,3 @@
-# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
-
 name: "Automatic Releases"
 
 on:
@@ -9,59 +7,9 @@ on:
 
 jobs:
   release:
-    name: "GIT tag, release & create merge-up PR"
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v3"
-
-      - name: "Release"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:release"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create Merge-Up Pull Request"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:create-merge-up-pull-request"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create and/or Switch to new Release Branch"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Bump Changelog Version On Originating Release Branch"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:bump-changelog"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
-
-      - name: "Create new milestones"
-        uses: "laminas/automatic-releases@v1"
-        with:
-          command-name: "laminas:automatic-releases:create-milestones"
-        env:
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
-          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
-          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
-          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
+    uses: laminas/workflow-automatic-releases/.github/workflows/release-on-milestone-closed.yml@1.x
+    secrets:
+      GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
+      GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
+      ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
+      SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
 /build/
 phpunit.xml
 /vendor/
+.phpunit.cache
+.phpunit.result.cache
+.php_cs.cache
+rector.php
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,19 +1,7 @@
 {
-    "extensions": [
-        "pcov"
-    ],
-    "ini": [
-        "pcov.enabled=1"
-    ],
-    "additional_checks": [
-        {
-            "name": "Coverage",
-            "job": {
-                "command": "vendor/bin/phpunit --coverage-clover coverage.xml"
-            }
-        }
-    ],
     "ignore_php_platform_requirements": {
-        "8.1": true
-    }
+        "8.3": false,
+        "8.4": true
+    },
+    "backwardCompatibilityCheck": true
 }
diff --git a/.laminas-ci/post-run.sh b/.laminas-ci/post-run.sh
diff --git a/Makefile b/Makefile
@@ -0,0 +1,54 @@
+# Run `make` (no arguments) to get a short description of what is available
+# within this `Makefile`.
+
+help: ## shows this help
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_\-\.]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+.PHONY: help
+
+install: ## Install PHP dependencies
+	composer install
+.PHONY: install
+
+update: ## Update PHP dependencies
+	composer update
+.PHONY: update
+
+bump: ## Update PHP dependencies
+	composer update
+	composer bump -D
+	composer update
+.PHONY: update
+
+clean: ## Clear out caches
+	rm -rf .phpunit.cache
+	rm -f .php_cs-cache
+	vendor/bin/psalm --clear-cache
+
+sa: ## Run static analysis checks
+	vendor/bin/psalm --no-cache --threads=1
+.PHONY: sa
+
+cs: ## Run coding standards checks
+	vendor/bin/phpcs
+.PHONY: cs
+
+test: ## Run unit tests
+	vendor/bin/phpunit
+.PHONY: test
+
+qa: cs sa test ## Run all QA Checks
+.PHONY: check
+
+get-rector: ## Install rector as a dev dependency
+ifeq (,$(wildcard ./vendor/bin/rector))
+	composer require --dev rector/rector
+endif
+.PHONY: get-rector
+
+remove-rector: ## Remove rector dependency
+	composer remove --dev rector/rector
+.PHONY: remove-rector
+
+rector: get-rector ## Run Rector
+	vendor/bin/rector
+.PHONY: rector
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)
-
 # PHP Api Client for Prismic.io
 
-[![Build Status](https://github.com/netglue/prismic-client/workflows/Continuous%20Integration/badge.svg)](https://github.com/netglue/prismic-client/actions?query=workflow%3A"Continuous+Integration") 
+[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)
+
+[![Build Status](https://github.com/netglue/prismic-client/workflows/Continuous%20Integration/badge.svg)](https://github.com/netglue/prismic-client/actions?query=workflow%3A"Continuous+Integration")
 [![codecov](https://codecov.io/gh/netglue/prismic-client/branch/main/graph/badge.svg)](https://codecov.io/gh/netglue/prismic-client)
 [![Psalm Type Coverage](https://shepherd.dev/github/netglue/prismic-client/coverage.svg)](https://shepherd.dev/github/netglue/prismic-client)
 [![Latest Stable Version](https://poser.pugx.org/netglue/prismic-client/v/stable)](https://packagist.org/packages/netglue/prismic-client)
@@ -31,7 +31,7 @@ There is practically zero backwards compatibility with other prismic clients so
 
 ## Installation
 
-Install with composer: `composer require netglue/prismic-client` 
+Install with composer: `composer require netglue/prismic-client`
 
 You will also require a PSR-18 HTTP client implementation, of which there are many, for example:
 
@@ -46,7 +46,7 @@ Docs are a work in progress and are hosted in a public prismic repository _(obvi
 
 You can view the docs by cloning the library, cd to the source and issue a `composer install` followed by a `composer serve`. This will start up PHP's built-in server on [http://127.0.0.1:8080](http://127.0.0.1:8080) showing the docs.
 
-#### Samples & Examples
+### Samples & Examples
 
 Take a look around in the `./samples` directory; that's where you’ll find the document explorer used for rendering the documentation and examples for setting up hydrating result sets, link resolver implementations and other stuff.
 

diff --git a/composer-require-checker.json b/composer-require-checker.json
diff --git a/composer.json b/composer.json
@@ -15,7 +15,11 @@
         "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "composer/package-versions-deprecated": true
+            "composer/package-versions-deprecated": true,
+            "php-http/discovery": false
+        },
+        "platform": {
+            "php": "8.2.99"
         }
     },
     "autoload": {
@@ -31,32 +35,32 @@
         }
     },
     "require": {
-        "php": "^7.4 || ~8.0 || ~8.1",
+        "php": "~8.2 || ~8.3 || ~8.4",
         "ext-json": "*",
         "laminas/laminas-escaper": "^2.9",
-        "php-http/discovery": "^1.14.1",
-        "psr/cache": "^1.0.0 || ^2.0.0",
+        "php-http/discovery": "^1.18.0",
+        "psr/cache": "^1.0.0 || ^2.0.0 || ^3.0.0",
         "psr/http-client-implementation": "*",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.0",
-        "symfony/polyfill-php80": "^1.17"
+        "psr/http-message": "^1.0 || ^2.0"
     },
     "require-dev": {
         "ext-curl": "*",
-        "doctrine/coding-standard": "^10.0",
-        "laminas/laminas-diactoros": "^2.13.0",
-        "maglnet/composer-require-checker": "^3.8.0",
-        "php-http/cache-plugin": "^1.7",
-        "php-http/curl-client": "^2.2",
-        "php-http/mock-client": "^1.5",
-        "phpunit/phpunit": "^9.5",
-        "psalm/plugin-phpunit": "^0.17.0",
+        "doctrine/coding-standard": "^12.0",
+        "laminas/laminas-diactoros": "^3.5.0",
+        "php-http/cache-plugin": "^2.0.1",
+        "php-http/curl-client": "^2.3.3",
+        "php-http/mock-client": "^1.6.1",
+        "phpunit/phpunit": "^11.5.4",
+        "psalm/plugin-phpunit": "^0.19.2",
         "roave/security-advisories": "dev-latest",
-        "squizlabs/php_codesniffer": "^3.7.1",
-        "symfony/cache": "^5.4 || ^6.0.0",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "vimeo/psalm": "^4.26.0"
+        "symfony/cache": "^6.4.13 || ^7.2.3",
+        "vimeo/psalm": "^6.0.0"
+    },
+    "conflict": {
+        "php-http/httplug": "<2.4.1",
+        "php-http/promise": "<1.3.1"
     },
     "scripts": {
         "check": [