chore: add support for PHPUnit 8 (#5252)

googleapis · May 13, 2022 · 8adcfea · 8adcfea
1 parent 0f04803
commit 8adcfea
Show file tree

Hide file tree

Showing 602 changed files with 2,457 additions and 2,201 deletions.
diff --git a/.github/emulator/start-emulator.sh b/.github/emulator/start-emulator.sh
@@ -1,9 +1,9 @@
 #!/bin/sh -eux
 
-docker pull -q gcr.io/google.com/cloudsdktool/cloud-sdk:342.0.0-emulators
+docker pull -q gcr.io/google.com/cloudsdktool/cloud-sdk:384.0.1-emulators
 CONTAINER=`docker run \
   -d \
   -p 8085:8085 \
-  gcr.io/google.com/cloudsdktool/cloud-sdk:342.0.0-emulators gcloud beta emulators $1 start --host-port=0.0.0.0:8085 --project=emulator-project`
+  gcr.io/google.com/cloudsdktool/cloud-sdk:384.0.1-emulators gcloud beta emulators $1 start --host-port=0.0.0.0:8085 --project=emulator-project`
 sleep 10
 docker logs $CONTAINER
diff --git a/.github/workflows/bigtable-emulator-system-tests.yaml b/.github/workflows/bigtable-emulator-system-tests.yaml
@@ -26,7 +26,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer update --prefer-dist --no-interaction --no-suggest -d Bigtable/
+          composer config minimum-stability dev -d Bigtable/
+          composer config repositories.local path "../Core" -d Bigtable
+          composer require "google/cloud-core:*" -d Bigtable/
 
       - name: Run system tests
         run: |

diff --git a/.github/workflows/datastore-emulator-system-tests.yaml b/.github/workflows/datastore-emulator-system-tests.yaml
@@ -1,3 +1,4 @@
+name: Run Datastore System Tests With Emulator
 on:
   push:
     branches:
@@ -7,7 +8,6 @@ on:
   pull_request:
     paths:
       - 'Datastore/**'
-name: Run Datastore System Tests With Emulator
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -26,7 +26,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer update --prefer-dist --no-interaction --no-suggest -d Datastore/
+          composer config minimum-stability dev -d Datastore/
+          composer config repositories.local path "../Core" -d Datastore
+          composer require "google/cloud-core:*" -d Datastore/
 
       - name: Run system tests
         run: |

diff --git a/.github/workflows/firestore-emulator-system-tests.yaml b/.github/workflows/firestore-emulator-system-tests.yaml
@@ -26,7 +26,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer update --prefer-dist --no-interaction --no-suggest -d Firestore/
+          composer config minimum-stability dev -d Firestore/
+          composer config repositories.local path "../Core" -d Firestore
+          composer require "google/cloud-core:*" -d Firestore/
 
       - name: Run system tests
         run: |

diff --git a/.github/workflows/pubsub-emulator-system-tests.yaml b/.github/workflows/pubsub-emulator-system-tests.yaml
@@ -22,11 +22,13 @@ jobs:
         with:
           php-version: '7.4'
           tools: pecl
-          extensions: grpc-1.38.0
+          extensions: grpc
 
       - name: Install dependencies
         run: |
-          composer update --prefer-dist --no-interaction --no-suggest -d PubSub/
+          composer config minimum-stability dev -d PubSub/
+          composer config repositories.local path "../Core" -d PubSub
+          composer require "google/cloud-core:*" -d PubSub/
 
       - name: Run system tests
         run: |

diff --git a/.github/workflows/spanner-emulator-system-tests.yaml b/.github/workflows/spanner-emulator-system-tests.yaml
@@ -9,7 +9,7 @@ on:
       - 'Spanner/**'
 name: Run Spanner System Tests With Emulator
 jobs:
-  php-test:
+  test:
     runs-on: ubuntu-latest
 
     services:
@@ -39,10 +39,12 @@ jobs:
         with:
           php-version: '7.4'
           tools: pecl
-          extensions: bcmath, grpc-1.37.1
+          extensions: bcmath, grpc
 
       - name: Install dependencies
         run: |
+          composer config minimum-stability dev -d Spanner/
+          composer config repositories.local  --json '{"type":"path", "url": "../Core", "options": {"versions": {"google/cloud-core": "1.45"}}}' -d Spanner
           composer update --prefer-dist --no-interaction --no-suggest -d Spanner/
 
       - name: Run system tests

diff --git a/AccessApproval/composer.json b/AccessApproval/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "suggest": {

diff --git a/AccessContextManager/composer.json b/AccessContextManager/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "conflict": {

diff --git a/AiPlatform/composer.json b/AiPlatform/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.12.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "suggest": {

diff --git a/AnalyticsAdmin/composer.json b/AnalyticsAdmin/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "suggest": {

diff --git a/AnalyticsData/composer.json b/AnalyticsData/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "suggest": {

diff --git a/ApiGateway/composer.json b/ApiGateway/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "suggest": {

diff --git a/ApigeeConnect/composer.json b/ApigeeConnect/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "suggest": {

diff --git a/AppEngineAdmin/composer.json b/AppEngineAdmin/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "suggest": {

diff --git a/ArtifactRegistry/composer.json b/ArtifactRegistry/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "suggest": {

diff --git a/Asset/composer.json b/Asset/composer.json
@@ -30,7 +30,8 @@
         "google/cloud-osconfig": "^0.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "google/cloud-core": "^1.39",
         "phpdocumentor/reflection": "^3.0"
     },

diff --git a/AssuredWorkloads/composer.json b/AssuredWorkloads/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "phpdocumentor/reflection": "^3.0"
     },
     "suggest": {

diff --git a/AutoMl/composer.json b/AutoMl/composer.json
@@ -26,7 +26,8 @@
         "google/gax": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "google/cloud-core": "^1.39",
         "phpdocumentor/reflection": "^3.0"
     },

diff --git a/AutoMl/tests/System/V1/AutoMlSmokeTest.php b/AutoMl/tests/System/V1/AutoMlSmokeTest.php
@@ -35,7 +35,7 @@ class AutoMlSmokeTest extends SystemTestCase
     private static $location = 'us-central1';
     private static $hasSetUp = false;
 
-    public static function setUpBeforeClass()
+    public static function set_up_before_class()
     {
         if (self::$hasSetUp) {
             return;

diff --git a/AutoMl/tests/System/V1beta1/AutoMlSmokeTest.php b/AutoMl/tests/System/V1beta1/AutoMlSmokeTest.php
@@ -35,7 +35,7 @@ class AutoMlSmokeTest extends SystemTestCase
     private static $location = 'us-central1';
     private static $hasSetUp = false;
 
-    public static function setUpBeforeClass()
+    public static function set_up_before_class()
     {
         if (self::$hasSetUp) {
             return;
@@ -88,7 +88,7 @@ public function testAutoMl(AutoMlClient $automl)
 
     public function clientsProvider()
     {
-        self::setUpBeforeClass();
+        self::set_up_before_class();
         return self::$clients;
     }
 }
diff --git a/BigQuery/composer.json b/BigQuery/composer.json
@@ -8,7 +8,8 @@
         "ramsey/uuid": "^3.0|^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^4.8|^5.0|^8.0",
+        "yoast/phpunit-polyfills": "^1.0",
         "squizlabs/php_codesniffer": "2.*",
         "phpdocumentor/reflection": "^3.0",
         "erusev/parsedown": "^1.6",

diff --git a/BigQuery/phpunit-snippets.xml.dist b/BigQuery/phpunit-snippets.xml.dist
@@ -2,7 +2,7 @@
 <phpunit
   bootstrap="./vendor/google/cloud-core/snippet-bootstrap.php"
   colors="true"
-  printerClass="Google\Cloud\Core\Testing\Snippet\Coverage\ResultPrinter">
+  >
   <testsuites>
     <testsuite>
       <directory>tests/Snippet</directory>

diff --git a/BigQuery/tests/Perf/BigQueryTest.php b/BigQuery/tests/Perf/BigQueryTest.php
@@ -18,7 +18,7 @@
 namespace Google\Cloud\BigQuery\Tests\Perf;
 
 use Google\Cloud\BigQuery\BigQueryClient;
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * @group bigquery
@@ -29,7 +29,7 @@ class BigQueryTest extends TestCase
 
     private $client;
 
-    public function setUp()
+    public function set_up()
     {
         $keyFilePath = getenv('GOOGLE_CLOUD_PHP_TESTS_KEY_PATH');
         $this->client = new BigQueryClient([

diff --git a/BigQuery/tests/Snippet/BigQueryClientTest.php b/BigQuery/tests/Snippet/BigQueryClientTest.php
@@ -75,7 +75,7 @@ class BigQueryClientTest extends SnippetTestCase
         ]
     ];
 
-    public function setUp()
+    public function set_up()
     {
         $this->connection = $this->prophesize(ConnectionInterface::class);
         $this->client = TestHelpers::stub(BigQueryTestClient::class);

diff --git a/BigQuery/tests/Snippet/CopyJobConfigurationTest.php b/BigQuery/tests/Snippet/CopyJobConfigurationTest.php
@@ -34,7 +34,7 @@ class CopyJobConfigurationTest extends SnippetTestCase
 
     private $config;
 
-    public function setUp()
+    public function set_up()
     {
         $this->config = new CopyJobConfiguration(
             self::PROJECT_ID,

diff --git a/BigQuery/tests/Snippet/DatasetTest.php b/BigQuery/tests/Snippet/DatasetTest.php
@@ -35,7 +35,7 @@ class DatasetTest extends SnippetTestCase
     private $connection;
     private $mapper;
 
-    public function setUp()
+    public function set_up()
     {
         $this->mapper = new ValueMapper(false);
         $this->identity = ['datasetId' => 'id', 'projectId' => 'projectId'];

diff --git a/BigQuery/tests/Snippet/ExtractJobConfigurationTest.php b/BigQuery/tests/Snippet/ExtractJobConfigurationTest.php
@@ -35,7 +35,7 @@ class ExtractJobConfigurationTest extends SnippetTestCase
 
     private $config;
 
-    public function setUp()
+    public function set_up()
     {
         $this->config = new ExtractJobConfiguration(
             self::PROJECT_ID,

diff --git a/BigQuery/tests/Snippet/InsertResponseTest.php b/BigQuery/tests/Snippet/InsertResponseTest.php
@@ -49,7 +49,7 @@ class InsertResponseTest extends SnippetTestCase
         ]
     ];
 
-    public function setUp()
+    public function set_up()
     {
         $this->insertResponse = new InsertResponse($this->info, $this->rows);
     }

diff --git a/BigQuery/tests/Snippet/JobTest.php b/BigQuery/tests/Snippet/JobTest.php
@@ -32,7 +32,7 @@ class JobTest extends SnippetTestCase
     private $identity;
     private $connection;
 
-    public function setUp()
+    public function set_up()
     {
         $this->identity = ['jobId' => 'id', 'projectId' => 'projectId'];
         $this->connection = $this->prophesize(ConnectionInterface::class);

diff --git a/BigQuery/tests/Snippet/LoadJobConfigurationTest.php b/BigQuery/tests/Snippet/LoadJobConfigurationTest.php
@@ -35,7 +35,7 @@ class LoadJobConfigurationTest extends SnippetTestCase
 
     private $config;
 
-    public function setUp()
+    public function set_up()
     {
         $this->config = new LoadJobConfiguration(
             self::PROJECT_ID,

diff --git a/BigQuery/tests/Snippet/ModelTest.php b/BigQuery/tests/Snippet/ModelTest.php
@@ -40,7 +40,7 @@ class ModelTest extends SnippetTestCase
     const MODEL_ID = 'myModelId';
     const JOB_ID = 'myJob';
 
-    public function setUp()
+    public function set_up()
     {
         $this->connection = $this->prophesize(ConnectionInterface::class);
         $this->model = TestHelpers::stub(Model::class, [

diff --git a/BigQuery/tests/Snippet/QueryJobConfigurationTest.php b/BigQuery/tests/Snippet/QueryJobConfigurationTest.php
@@ -35,7 +35,7 @@ class QueryJobConfigurationTest extends SnippetTestCase
 
     private $config;
 
-    public function setUp()
+    public function set_up()
     {
         $this->config = new QueryJobConfiguration(
             new ValueMapper(false),

diff --git a/BigQuery/tests/Snippet/QueryResultsTest.php b/BigQuery/tests/Snippet/QueryResultsTest.php
@@ -38,7 +38,7 @@ class QueryResultsTest extends SnippetTestCase
     private $connection;
     private $qr;
 
-    public function setUp()
+    public function set_up()
     {
         $this->info = [
             'totalBytesProcessed' => 3,

diff --git a/BigQuery/tests/Snippet/RoutineTest.php b/BigQuery/tests/Snippet/RoutineTest.php
@@ -36,7 +36,7 @@ class RoutineTest extends SnippetTestCase
     private $routine;
     private $identity;
 
-    public function setUp()
+    public function set_up()
     {
         $this->connection = $this->prophesize(ConnectionInterface::class);
         $this->identity = [

diff --git a/BigQuery/tests/Snippet/TableTest.php b/BigQuery/tests/Snippet/TableTest.php
@@ -50,7 +50,7 @@ class TableTest extends SnippetTestCase
     private $table;
     private $mapper;
 
-    public function setUp()
+    public function set_up()
     {
         $this->info = [
             'rows' => [

diff --git a/BigQuery/tests/System/BigQueryTestCase.php b/BigQuery/tests/System/BigQueryTestCase.php
@@ -34,7 +34,7 @@ class BigQueryTestCase extends SystemTestCase
     protected static $table;
     private static $hasSetUp = false;
 
-    public static function setUpBeforeClass()
+    public static function set_up_before_class()
     {
         if (self::$hasSetUp) {
             return;
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,7 @@ class InsertResponseTest extends SnippetTestCase @@
             ]
         ];
-        public function setUp()
+        public function set_up()
         {
             $this->insertResponse = new InsertResponse($this->info, $this->rows);
         }
@@ Expand Down @@