From 86be288c308e7aa00a44ba84a3cfc43ad64bc375 Mon Sep 17 00:00:00 2001
From: Brent Shaffer <betterbrent@google.com>
Date: Wed, 20 Apr 2022 15:33:45 -0600
Subject: [PATCH 1/2] move composer.json out of root to avoid confusion

---
 composer.json => php/composer.json.dist | 0
 php/release.sh                          | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename composer.json => php/composer.json.dist (100%)

diff --git a/composer.json b/php/composer.json.dist
similarity index 100%
rename from composer.json
rename to php/composer.json.dist
diff --git a/php/release.sh b/php/release.sh
index 9a4b13912652..4ababf1b2550 100755
--- a/php/release.sh
+++ b/php/release.sh
@@ -26,7 +26,7 @@ popd
 # Copy files
 pushd protobuf-php
 mv ../protobuf/php/src src
-mv ../protobuf/composer.json composer.json
+mv ../protobuf/php/composer.json.dist composer.json
 sed -i 's|php/src|src|g' composer.json
 git add .
 git commit -m "$VERSION"

From f85225368dbec58e0e5f3257669cafd602756390 Mon Sep 17 00:00:00 2001
From: Brent Shaffer <betterbrent@google.com>
Date: Wed, 20 Apr 2022 15:29:37 -0600
Subject: [PATCH 2/2] fix: update php deployed json

---
 php/composer.json.dist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/composer.json.dist b/php/composer.json.dist
index 2c64ad220f7d..825f29da3b40 100644
--- a/php/composer.json.dist
+++ b/php/composer.json.dist
@@ -6,10 +6,10 @@
   "homepage": "https://developers.google.com/protocol-buffers/",
   "license": "BSD-3-Clause",
   "require": {
-    "php": ">=5.5.0"
+    "php": ">=7.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": ">=4.8.0"
+    "phpunit/phpunit": ">=5.0.0"
   },
   "suggest": {
     "ext-bcmath": "Need to support JSON deserialization"