From 05c74be436246ac9ab4f6ed03a47d99f8d9d5fde Mon Sep 17 00:00:00 2001
From: Brent Shaffer <betterbrent@google.com>
Date: Fri, 6 Sep 2024 10:53:52 -0600
Subject: [PATCH] fix: add back compatibility for Protobuf v4 (#7648)

---
 .gitattributes |  6 +++---
 .gitignore     | 12 ------------
 composer.json  |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitattributes b/.gitattributes
index d0b21161..4981b02e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
+/*.xml.dist export-ignore
+/.OwlBot.yaml export-ignore
 /.gitattributes export-ignore
 /.github export-ignore
-/.gitignore export-ignore
-/dev export-ignore
+/owlbot.py export-ignore
 /tests export-ignore
-/phpunit.xml.dist export-ignore
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7e3271ea..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# Directories created when regenerating protos
-out/
-tmp_common_protos/
-
-# Composer related dirs
-composer.lock
-vendor/
-
-# Doc generation dirs
-tmp_gh-pages/
-cache/
diff --git a/composer.json b/composer.json
index a70561b1..620bc71c 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
   "license": "Apache-2.0",
   "require": {
     "php": "^8.0",
-    "google/protobuf": "^3.6.1"
+    "google/protobuf": "^v3.25.3||^4.26.1"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.6"