From 9a64deddafd2b25979a87deead66da9ebc7f3ece Mon Sep 17 00:00:00 2001
From: Jay Klehr <jay@diablomedia.com>
Date: Thu, 18 Apr 2024 13:30:47 -0600
Subject: [PATCH 1/2] 8.3 Updates

---
 .github/workflows/build.yml                 | 4 ++--
 .github/workflows/dependabot-auto-merge.yml | 2 +-
 composer.json                               | 9 +++++----
 phpunit.xml.dist                            | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba1d512..3bb173d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@2.30.2
         with:
@@ -32,7 +32,7 @@ jobs:
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: php${{ matrix.php-versions }}-composer-${{ matrix.composer-args }}-${{ hashFiles('**/composer.json') }}
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
index cc4b7bf..3aaaca1 100644
--- a/.github/workflows/dependabot-auto-merge.yml
+++ b/.github/workflows/dependabot-auto-merge.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs
diff --git a/composer.json b/composer.json
index 36da037..8cd97e9 100644
--- a/composer.json
+++ b/composer.json
@@ -9,10 +9,11 @@
     "homepage": "http://framework.zend.com/",
     "license": "BSD-3-Clause",
     "prefer-stable": true,
+    "minimum-stability": "dev",
     "require": {
         "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-        "diablomedia/zendframework1-exception": "^1.0.4",
-        "diablomedia/zendframework1-json": "^1.0.6"
+        "diablomedia/zendframework1-exception": "dev-master as 1.0.4",
+        "diablomedia/zendframework1-json": "dev-php83 as 1.0.6"
     },
     "autoload": {
         "psr-0": {
@@ -30,9 +31,9 @@
     "require-dev": {
         "phpunit/phpunit": "^9.6.19 || ^10.5.18",
         "phpstan/phpstan": "1.10.67",
-        "friendsofphp/php-cs-fixer": "3.53.0",
+        "friendsofphp/php-cs-fixer": "3.54.0",
         "maglnet/composer-require-checker": "^3.0.0",
-        "phpro/grumphp-shim": "^1.5.0"
+        "phpro/grumphp-shim": "^2.0.0"
     },
     "archive": {
         "exclude": [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a21a81c..5566b27 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" beStrictAboutTestsThatDoNotTestAnything="true" backupGlobals="true" stderr="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" beStrictAboutTestsThatDoNotTestAnything="true" backupGlobals="true" stderr="true" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" displayDetailsOnTestsThatTriggerDeprecations="true" displayDetailsOnTestsThatTriggerErrors="true" displayDetailsOnTestsThatTriggerNotices="true" displayDetailsOnTestsThatTriggerWarnings="true" failOnDeprecation="true" failOnNotice="true">
   <testsuites>
     <testsuite name="default">
       <directory>./tests</directory>

From 0c713506fe4d664f1679a996d058a393ef7b4020 Mon Sep 17 00:00:00 2001
From: Jay Klehr <jay@diablomedia.com>
Date: Fri, 19 Apr 2024 08:44:48 -0600
Subject: [PATCH 2/2] versions

---
 composer.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 8cd97e9..3178c5c 100644
--- a/composer.json
+++ b/composer.json
@@ -9,11 +9,10 @@
     "homepage": "http://framework.zend.com/",
     "license": "BSD-3-Clause",
     "prefer-stable": true,
-    "minimum-stability": "dev",
     "require": {
         "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-        "diablomedia/zendframework1-exception": "dev-master as 1.0.4",
-        "diablomedia/zendframework1-json": "dev-php83 as 1.0.6"
+        "diablomedia/zendframework1-exception": "^1.1.1",
+        "diablomedia/zendframework1-json": "^1.0.7"
     },
     "autoload": {
         "psr-0": {