Merge branch 'main' into owl-bot-copy-f25edb897fa9aefc024c

googleapis · Jul 28, 2022 · 7944c36 · 7944c36
2 parents cb7b9d5 + 0a6618b
commit 7944c36
Show file tree

Hide file tree

Showing 126 changed files with 4,708 additions and 1,225 deletions.
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-php:latest
-  digest: sha256:02e3f5f7581f89b5d8eeaf2c38e6e406164b0f0ec76302e9e6261c477dae1d71
+  digest: sha256:337c391eeefb60b60e8faf0b740e1e290cd8bc48fcada6a090a97b36ed2f196b
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -16,18 +16,15 @@ jobs:
         phpunit-filename: [phpunit]
         grpc-version: [grpc]
         include:
-          - platform: ubuntu-latest
-            php: "5.5"
-            phpunit-filename: phpunit-php5
-            grpc-version: grpc-1.33.1
           - platform: ubuntu-latest
             php: "5.6"
             phpunit-filename: phpunit-php5
             grpc-version: grpc
     name: PHP ${{ matrix.php }} Unit Test (${{ matrix.platform }})
     runs-on: ${{ matrix.platform }}
     steps:
-    - uses: actions-ecosystem/action-remove-labels@v1
+    - if: ${{ github.event.action == 'labeled' }}
+      uses: actions-ecosystem/action-remove-labels@v1
       with:
         labels: gh:run-tests
     - uses: actions/checkout@v3

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ You can sign these electronically (just scroll to the bottom). After that, we'll
 In order to use Google Cloud PHP, some setup is required!
 
 1. Install PHP.
-    Google Cloud PHP requires PHP 5.5 or higher. Installation of PHP varies depending on your system. Refer to the [PHP installation and configuration documentation](http://php.net/manual/en/install.php) for detailed instructions.
+    Google Cloud PHP requires PHP 5.6 or higher. Installation of PHP varies depending on your system. Refer to the [PHP installation and configuration documentation](http://php.net/manual/en/install.php) for detailed instructions.
 
 2. Install [Composer](https://getcomposer.org/download/).
 

diff --git a/Core/composer.json b/Core/composer.json
@@ -4,7 +4,7 @@
     "license": "Apache-2.0",
     "minimum-stability": "stable",
     "require": {
-        "php": ">=5.5",
+        "php": ">=5.6",
         "rize/uri-template": "~0.3",
         "google/auth": "^1.18",
         "guzzlehttp/guzzle": "^5.3|^6.5.7|^7.4.4",

diff --git a/Datastore/metadata/V1/Datastore.php b/Datastore/metadata/V1/Datastore.php
diff --git a/Datastore/metadata/V1/Entity.php b/Datastore/metadata/V1/Entity.php
diff --git a/Datastore/metadata/V1/Query.php b/Datastore/metadata/V1/Query.php
diff --git a/Datastore/src/Connection/Grpc.php b/Datastore/src/Connection/Grpc.php
@@ -101,7 +101,10 @@ public function __construct(array $config = [])
         }
 
         if ((bool) $config['emulatorHost']) {
-            $grpcConfig += $this->emulatorGapicConfig($config['emulatorHost']);
+            $grpcConfig = array_merge(
+                $grpcConfig,
+                $this->emulatorGapicConfig($config['emulatorHost'])
+            );
         }
 
         $this->datastoreClient = isset($config['gapicDatastoreClient'])

diff --git a/Datastore/src/V1/AllocateIdsRequest.php b/Datastore/src/V1/AllocateIdsRequest.php
diff --git a/Datastore/src/V1/AllocateIdsResponse.php b/Datastore/src/V1/AllocateIdsResponse.php
diff --git a/Datastore/src/V1/ArrayValue.php b/Datastore/src/V1/ArrayValue.php
diff --git a/Datastore/src/V1/BeginTransactionRequest.php b/Datastore/src/V1/BeginTransactionRequest.php
diff --git a/Datastore/src/V1/CommitRequest.php b/Datastore/src/V1/CommitRequest.php
diff --git a/Datastore/src/V1/CommitResponse.php b/Datastore/src/V1/CommitResponse.php
diff --git a/Datastore/src/V1/CompositeFilter.php b/Datastore/src/V1/CompositeFilter.php
diff --git a/Datastore/src/V1/CompositeFilter/Operator.php b/Datastore/src/V1/CompositeFilter/Operator.php