upgrade to phpunit8

pull/24695/head
root 4 years ago
parent b73be37404
commit 39e2ad44f2
  1. 4
      src/php/docker/alpine/Dockerfile
  2. 4
      src/php/docker/centos7/Dockerfile
  3. 4
      src/php/docker/grpc-ext/Dockerfile
  4. 4
      src/php/docker/grpc-src/Dockerfile
  5. 4
      src/php/docker/i386/Dockerfile
  6. 4
      src/php/docker/php-future/Dockerfile
  7. 4
      src/php/docker/php-src/Dockerfile
  8. 4
      src/php/docker/php-zts/Dockerfile
  9. 4
      src/php/docker/php8/Dockerfile
  10. 2
      src/php/tests/generated_code/AbstractGeneratedCodeTest.php
  11. 2
      src/php/tests/unit_tests/CallCredentials2Test.php
  12. 2
      src/php/tests/unit_tests/CallCredentialsTest.php
  13. 2
      src/php/tests/unit_tests/CallInvokerTest.php
  14. 2
      src/php/tests/unit_tests/CallTest.php
  15. 2
      src/php/tests/unit_tests/ChannelCredentialsTest.php
  16. 2
      src/php/tests/unit_tests/ChannelTest.php
  17. 2
      src/php/tests/unit_tests/EndToEndTest.php
  18. 2
      src/php/tests/unit_tests/InterceptorTest.php
  19. 2
      src/php/tests/unit_tests/PersistentChannelTests/PersistentChannelTest.php
  20. 2
      src/php/tests/unit_tests/SecureEndToEndTest.php
  21. 2
      src/php/tests/unit_tests/ServerTest.php
  22. 2
      src/php/tests/unit_tests/TimevalTest.php
  23. 4
      templates/src/php/docker/download_phpunit.include

@ -21,8 +21,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ RUN wget https://phar.phpunit.de/phpunit-8.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ mv phpunit-8.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

@ -35,8 +35,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ RUN wget https://phar.phpunit.de/phpunit-8.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ mv phpunit-8.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ RUN wget https://phar.phpunit.de/phpunit-8.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ mv phpunit-8.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ RUN wget https://phar.phpunit.de/phpunit-8.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ mv phpunit-8.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ RUN wget https://phar.phpunit.de/phpunit-8.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ mv phpunit-8.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ RUN wget https://phar.phpunit.de/phpunit-8.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ mv phpunit-8.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ RUN apt-get -qq update && apt-get -qq install -y \
WORKDIR /tmp WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ RUN wget https://phar.phpunit.de/phpunit-8.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ mv phpunit-8.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

@ -23,8 +23,8 @@ ARG MAKEFLAGS=-j8
WORKDIR /tmp WORKDIR /tmp
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ RUN wget https://phar.phpunit.de/phpunit-8.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ mv phpunit-8.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

@ -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' && \ 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 rm go-pear.phar
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ RUN wget https://phar.phpunit.de/phpunit-8.phar && \
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ mv phpunit-8.phar /usr/local/bin/phpunit && \
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

@ -23,7 +23,7 @@ require_once realpath(dirname(__FILE__).'/../../vendor/autoload.php');
@include_once dirname(__FILE__).'/math.pb.php'; @include_once dirname(__FILE__).'/math.pb.php';
@include_once dirname(__FILE__).'/math_grpc_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 * These tests require that a server exporting the math service must be

@ -17,7 +17,7 @@
* *
*/ */
class CallCredentials2Test extends PHPUnit_Framework_TestCase class CallCredentials2Test extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -17,7 +17,7 @@
* *
*/ */
class CallCredentialsTest extends PHPUnit_Framework_TestCase class CallCredentialsTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -159,7 +159,7 @@ class CallInvokerChangeRequestCall
} }
} }
class CallInvokerTest extends PHPUnit_Framework_TestCase class CallInvokerTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
* *
*/ */
class CallTest extends PHPUnit_Framework_TestCase class CallTest extends \PHPUnit\Framework\TestCase
{ {
public static $server; public static $server;
public static $port; public static $port;

@ -17,7 +17,7 @@
* *
*/ */
class ChanellCredentialsTest extends PHPUnit_Framework_TestCase class ChanellCredentialsTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -17,7 +17,7 @@
* *
*/ */
class ChannelTest extends PHPUnit_Framework_TestCase class ChannelTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
* *
*/ */
class EndToEndTest extends PHPUnit_Framework_TestCase class EndToEndTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -215,7 +215,7 @@ class StopCallInterceptor extends Grpc\Interceptor
} }
} }
class InterceptorTest extends PHPUnit_Framework_TestCase class InterceptorTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -20,7 +20,7 @@
/** /**
* @group persistent_list_bound_tests * @group persistent_list_bound_tests
*/ */
class PersistentListTest extends PHPUnit_Framework_TestCase class PersistentListTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
* *
*/ */
class SecureEndToEndTest extends PHPUnit_Framework_TestCase class SecureEndToEndTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -17,7 +17,7 @@
* *
*/ */
class ServerTest extends PHPUnit_Framework_TestCase class ServerTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
* *
*/ */
class TimevalTest extends PHPUnit_Framework_TestCase class TimevalTest extends \PHPUnit\Framework\TestCase
{ {
public function setUp() public function setUp()
{ {

@ -1,3 +1,3 @@
RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && ${'\\'} RUN wget https://phar.phpunit.de/phpunit-8.phar && ${'\\'}
mv phpunit-5.7.27.phar /usr/local/bin/phpunit && ${'\\'} mv phpunit-8.phar /usr/local/bin/phpunit && ${'\\'}
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit

Loading…
Cancel
Save