From 39e2ad44f2bf42c9e56f8ac1c929ca33a19b7fa3 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 6 Nov 2020 08:46:23 +0000 Subject: [PATCH] upgrade to phpunit8 --- src/php/docker/alpine/Dockerfile | 4 ++-- src/php/docker/centos7/Dockerfile | 4 ++-- src/php/docker/grpc-ext/Dockerfile | 4 ++-- src/php/docker/grpc-src/Dockerfile | 4 ++-- src/php/docker/i386/Dockerfile | 4 ++-- src/php/docker/php-future/Dockerfile | 4 ++-- src/php/docker/php-src/Dockerfile | 4 ++-- src/php/docker/php-zts/Dockerfile | 4 ++-- src/php/docker/php8/Dockerfile | 4 ++-- src/php/tests/generated_code/AbstractGeneratedCodeTest.php | 2 +- src/php/tests/unit_tests/CallCredentials2Test.php | 2 +- src/php/tests/unit_tests/CallCredentialsTest.php | 2 +- src/php/tests/unit_tests/CallInvokerTest.php | 2 +- src/php/tests/unit_tests/CallTest.php | 2 +- src/php/tests/unit_tests/ChannelCredentialsTest.php | 2 +- src/php/tests/unit_tests/ChannelTest.php | 2 +- src/php/tests/unit_tests/EndToEndTest.php | 2 +- src/php/tests/unit_tests/InterceptorTest.php | 2 +- .../PersistentChannelTests/PersistentChannelTest.php | 2 +- src/php/tests/unit_tests/SecureEndToEndTest.php | 2 +- src/php/tests/unit_tests/ServerTest.php | 2 +- src/php/tests/unit_tests/TimevalTest.php | 2 +- templates/src/php/docker/download_phpunit.include | 4 ++-- 23 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/php/docker/alpine/Dockerfile b/src/php/docker/alpine/Dockerfile index a71c2afeccf..fa827ab513f 100644 --- a/src/php/docker/alpine/Dockerfile +++ b/src/php/docker/alpine/Dockerfile @@ -21,8 +21,8 @@ ARG MAKEFLAGS=-j8 WORKDIR /tmp -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ +RUN wget https://phar.phpunit.de/phpunit-8.phar && \ + mv phpunit-8.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/src/php/docker/centos7/Dockerfile b/src/php/docker/centos7/Dockerfile index e6df3ef819e..b02412b8d0f 100644 --- a/src/php/docker/centos7/Dockerfile +++ b/src/php/docker/centos7/Dockerfile @@ -35,8 +35,8 @@ ARG MAKEFLAGS=-j8 WORKDIR /tmp -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ +RUN wget https://phar.phpunit.de/phpunit-8.phar && \ + mv phpunit-8.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/src/php/docker/grpc-ext/Dockerfile b/src/php/docker/grpc-ext/Dockerfile index 93d0307c4a0..4421861be87 100644 --- a/src/php/docker/grpc-ext/Dockerfile +++ b/src/php/docker/grpc-ext/Dockerfile @@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8 WORKDIR /tmp -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ +RUN wget https://phar.phpunit.de/phpunit-8.phar && \ + mv phpunit-8.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/src/php/docker/grpc-src/Dockerfile b/src/php/docker/grpc-src/Dockerfile index 936ddc0da23..13955245b0c 100644 --- a/src/php/docker/grpc-src/Dockerfile +++ b/src/php/docker/grpc-src/Dockerfile @@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8 WORKDIR /tmp -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ +RUN wget https://phar.phpunit.de/phpunit-8.phar && \ + mv phpunit-8.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/src/php/docker/i386/Dockerfile b/src/php/docker/i386/Dockerfile index dff43552558..c53e921b6c1 100644 --- a/src/php/docker/i386/Dockerfile +++ b/src/php/docker/i386/Dockerfile @@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8 WORKDIR /tmp -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ +RUN wget https://phar.phpunit.de/phpunit-8.phar && \ + mv phpunit-8.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/src/php/docker/php-future/Dockerfile b/src/php/docker/php-future/Dockerfile index 95c0ac47a07..52f726232ba 100644 --- a/src/php/docker/php-future/Dockerfile +++ b/src/php/docker/php-future/Dockerfile @@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8 WORKDIR /tmp -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ +RUN wget https://phar.phpunit.de/phpunit-8.phar && \ + mv phpunit-8.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/src/php/docker/php-src/Dockerfile b/src/php/docker/php-src/Dockerfile index 972a297aafe..1f0fe61e29c 100644 --- a/src/php/docker/php-src/Dockerfile +++ b/src/php/docker/php-src/Dockerfile @@ -23,8 +23,8 @@ RUN apt-get -qq update && apt-get -qq install -y \ WORKDIR /tmp -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ +RUN wget https://phar.phpunit.de/phpunit-8.phar && \ + mv phpunit-8.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/src/php/docker/php-zts/Dockerfile b/src/php/docker/php-zts/Dockerfile index 9bc9d37152d..f3b39e90eeb 100644 --- a/src/php/docker/php-zts/Dockerfile +++ b/src/php/docker/php-zts/Dockerfile @@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8 WORKDIR /tmp -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ +RUN wget https://phar.phpunit.de/phpunit-8.phar && \ + mv phpunit-8.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/src/php/docker/php8/Dockerfile b/src/php/docker/php8/Dockerfile index 397bbcd98d0..25a9c62054a 100644 --- a/src/php/docker/php8/Dockerfile +++ b/src/php/docker/php8/Dockerfile @@ -29,8 +29,8 @@ RUN apt-get install expect -y && \ expect -c 'spawn php ./go-pear.phar; expect "or Enter to continue:"; send "\n"; expect "Currently used php.ini"; send "\n"; expect eof' && \ rm go-pear.phar -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ +RUN wget https://phar.phpunit.de/phpunit-8.phar && \ + mv phpunit-8.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/src/php/tests/generated_code/AbstractGeneratedCodeTest.php b/src/php/tests/generated_code/AbstractGeneratedCodeTest.php index f7b47359992..a68954606f7 100644 --- a/src/php/tests/generated_code/AbstractGeneratedCodeTest.php +++ b/src/php/tests/generated_code/AbstractGeneratedCodeTest.php @@ -23,7 +23,7 @@ require_once realpath(dirname(__FILE__).'/../../vendor/autoload.php'); @include_once dirname(__FILE__).'/math.pb.php'; @include_once dirname(__FILE__).'/math_grpc_pb.php'; -abstract class AbstractGeneratedCodeTest extends PHPUnit_Framework_TestCase +abstract class AbstractGeneratedCodeTest extends \PHPUnit\Framework\TestCase { /** * These tests require that a server exporting the math service must be diff --git a/src/php/tests/unit_tests/CallCredentials2Test.php b/src/php/tests/unit_tests/CallCredentials2Test.php index c63029f121b..e293fe266fc 100644 --- a/src/php/tests/unit_tests/CallCredentials2Test.php +++ b/src/php/tests/unit_tests/CallCredentials2Test.php @@ -17,7 +17,7 @@ * */ -class CallCredentials2Test extends PHPUnit_Framework_TestCase +class CallCredentials2Test extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/CallCredentialsTest.php b/src/php/tests/unit_tests/CallCredentialsTest.php index 818b823da71..e3f3966268a 100644 --- a/src/php/tests/unit_tests/CallCredentialsTest.php +++ b/src/php/tests/unit_tests/CallCredentialsTest.php @@ -17,7 +17,7 @@ * */ -class CallCredentialsTest extends PHPUnit_Framework_TestCase +class CallCredentialsTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/CallInvokerTest.php b/src/php/tests/unit_tests/CallInvokerTest.php index 00b5b998652..d38feb9d975 100644 --- a/src/php/tests/unit_tests/CallInvokerTest.php +++ b/src/php/tests/unit_tests/CallInvokerTest.php @@ -159,7 +159,7 @@ class CallInvokerChangeRequestCall } } -class CallInvokerTest extends PHPUnit_Framework_TestCase +class CallInvokerTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/CallTest.php b/src/php/tests/unit_tests/CallTest.php index 23d8e772d0e..602369512ae 100644 --- a/src/php/tests/unit_tests/CallTest.php +++ b/src/php/tests/unit_tests/CallTest.php @@ -16,7 +16,7 @@ * limitations under the License. * */ -class CallTest extends PHPUnit_Framework_TestCase +class CallTest extends \PHPUnit\Framework\TestCase { public static $server; public static $port; diff --git a/src/php/tests/unit_tests/ChannelCredentialsTest.php b/src/php/tests/unit_tests/ChannelCredentialsTest.php index e7e695c9c76..932fb1d0813 100644 --- a/src/php/tests/unit_tests/ChannelCredentialsTest.php +++ b/src/php/tests/unit_tests/ChannelCredentialsTest.php @@ -17,7 +17,7 @@ * */ -class ChanellCredentialsTest extends PHPUnit_Framework_TestCase +class ChanellCredentialsTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/ChannelTest.php b/src/php/tests/unit_tests/ChannelTest.php index 58f96a740b6..714b693d890 100644 --- a/src/php/tests/unit_tests/ChannelTest.php +++ b/src/php/tests/unit_tests/ChannelTest.php @@ -17,7 +17,7 @@ * */ -class ChannelTest extends PHPUnit_Framework_TestCase +class ChannelTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/EndToEndTest.php b/src/php/tests/unit_tests/EndToEndTest.php index d0965655e0a..701f92321bc 100644 --- a/src/php/tests/unit_tests/EndToEndTest.php +++ b/src/php/tests/unit_tests/EndToEndTest.php @@ -16,7 +16,7 @@ * limitations under the License. * */ -class EndToEndTest extends PHPUnit_Framework_TestCase +class EndToEndTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/InterceptorTest.php b/src/php/tests/unit_tests/InterceptorTest.php index acd68fc45a2..1ab4e2c8146 100644 --- a/src/php/tests/unit_tests/InterceptorTest.php +++ b/src/php/tests/unit_tests/InterceptorTest.php @@ -215,7 +215,7 @@ class StopCallInterceptor extends Grpc\Interceptor } } -class InterceptorTest extends PHPUnit_Framework_TestCase +class InterceptorTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/PersistentChannelTests/PersistentChannelTest.php b/src/php/tests/unit_tests/PersistentChannelTests/PersistentChannelTest.php index 7b44221f89b..860fc865261 100644 --- a/src/php/tests/unit_tests/PersistentChannelTests/PersistentChannelTest.php +++ b/src/php/tests/unit_tests/PersistentChannelTests/PersistentChannelTest.php @@ -20,7 +20,7 @@ /** * @group persistent_list_bound_tests */ -class PersistentListTest extends PHPUnit_Framework_TestCase +class PersistentListTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/SecureEndToEndTest.php b/src/php/tests/unit_tests/SecureEndToEndTest.php index 071598c4c19..23ab04c62c4 100644 --- a/src/php/tests/unit_tests/SecureEndToEndTest.php +++ b/src/php/tests/unit_tests/SecureEndToEndTest.php @@ -16,7 +16,7 @@ * limitations under the License. * */ -class SecureEndToEndTest extends PHPUnit_Framework_TestCase +class SecureEndToEndTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/ServerTest.php b/src/php/tests/unit_tests/ServerTest.php index cab92e59419..6597853184a 100644 --- a/src/php/tests/unit_tests/ServerTest.php +++ b/src/php/tests/unit_tests/ServerTest.php @@ -17,7 +17,7 @@ * */ -class ServerTest extends PHPUnit_Framework_TestCase +class ServerTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/src/php/tests/unit_tests/TimevalTest.php b/src/php/tests/unit_tests/TimevalTest.php index 000b2db32d5..b5f372d6933 100644 --- a/src/php/tests/unit_tests/TimevalTest.php +++ b/src/php/tests/unit_tests/TimevalTest.php @@ -16,7 +16,7 @@ * limitations under the License. * */ -class TimevalTest extends PHPUnit_Framework_TestCase +class TimevalTest extends \PHPUnit\Framework\TestCase { public function setUp() { diff --git a/templates/src/php/docker/download_phpunit.include b/templates/src/php/docker/download_phpunit.include index 5387119bf55..17a4439fb59 100644 --- a/templates/src/php/docker/download_phpunit.include +++ b/templates/src/php/docker/download_phpunit.include @@ -1,3 +1,3 @@ -RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && ${'\\'} - mv phpunit-5.7.27.phar /usr/local/bin/phpunit && ${'\\'} +RUN wget https://phar.phpunit.de/phpunit-8.phar && ${'\\'} + mv phpunit-8.phar /usr/local/bin/phpunit && ${'\\'} chmod +x /usr/local/bin/phpunit