From 867f579e5411b9a3b01634e7ccd083085e667309 Mon Sep 17 00:00:00 2001
From: root <hannahshisfb@gmail.com>
Date: Fri, 21 Aug 2020 01:49:03 +0000
Subject: [PATCH] del php5 from basic Linux test and interop test

---
 .../pull_request/grpc_basictests_php.cfg      |  2 +-
 tools/interop_matrix/client_matrix.py         |  2 +-
 tools/run_tests/run_interop_tests.py          | 38 +------------------
 3 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/tools/internal_ci/linux/pull_request/grpc_basictests_php.cfg b/tools/internal_ci/linux/pull_request/grpc_basictests_php.cfg
index c844fcfae00..a83ce016467 100644
--- a/tools/internal_ci/linux/pull_request/grpc_basictests_php.cfg
+++ b/tools/internal_ci/linux/pull_request/grpc_basictests_php.cfg
@@ -26,5 +26,5 @@ action {
 
 env_vars {
   key: "RUN_TESTS_FLAGS"
-  value: "-f basictests linux php --inner_jobs 16 -j 2 --internal_ci --max_time=3600"
+  value: "-f basictests linux php7 --inner_jobs 16 -j 2 --internal_ci --max_time=3600"
 }
diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py
index c2f63bcaf92..bdba08455db 100644
--- a/tools/interop_matrix/client_matrix.py
+++ b/tools/interop_matrix/client_matrix.py
@@ -59,7 +59,7 @@ LANG_RUNTIME_MATRIX = {
     'python': ['python', 'pythonasyncio'],
     'node': ['node'],
     'ruby': ['ruby'],
-    'php': ['php', 'php7'],
+    'php': ['php7'],
     'csharp': ['csharp', 'csharpcoreclr'],
 }
 
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index 0ee4d5d72fc..b106f672554 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -483,35 +483,6 @@ class NodePureJSLanguage:
         return 'nodepurejs'
 
 
-class PHPLanguage:
-
-    def __init__(self):
-        self.client_cwd = None
-        self.safename = str(self)
-
-    def client_cmd(self, args):
-        return ['src/php/bin/interop_client.sh'] + args
-
-    def cloud_to_prod_env(self):
-        return {}
-
-    def global_env(self):
-        return {}
-
-    def unimplemented_test_cases(self):
-        return _SKIP_SERVER_COMPRESSION + \
-            _SKIP_DATA_FRAME_PADDING + \
-            _SKIP_SPECIAL_STATUS_MESSAGE + \
-            _SKIP_GOOGLE_DEFAULT_CREDS + \
-            _SKIP_COMPUTE_ENGINE_CHANNEL_CREDS
-
-    def unimplemented_test_cases_server(self):
-        return []
-
-    def __str__(self):
-        return 'php'
-
-
 class PHP7Language:
 
     def __init__(self):
@@ -734,7 +705,6 @@ _LANGUAGES = {
     'javaokhttp': JavaOkHttpClient(),
     'node': NodeLanguage(),
     'nodepurejs': NodePureJSLanguage(),
-    'php': PHPLanguage(),
     'php7': PHP7Language(),
     'objc': ObjcLanguage(),
     'ruby': RubyLanguage(),
@@ -879,7 +849,7 @@ def auth_options(language, test_case, google_default_creds_use_key_file,
 
     if test_case in ['jwt_token_creds', 'per_rpc_creds', 'oauth2_auth_token']:
         if language in [
-                'csharp', 'csharpcoreclr', 'aspnetcore', 'node', 'php', 'php7',
+                'csharp', 'csharpcoreclr', 'aspnetcore', 'node', 'php7',
                 'python', 'ruby', 'nodepurejs'
         ]:
             env['GOOGLE_APPLICATION_CREDENTIALS'] = service_account_key_file
@@ -1161,12 +1131,6 @@ def build_interop_image_jobspec(language, tag=None):
     }
     if not args.travis:
         env['TTY_FLAG'] = '-t'
-    # This env variable is used to get around the github rate limit
-    # error when running the PHP `composer install` command
-    host_file = '%s/.composer/auth.json' % os.environ['HOME']
-    if language.safename == 'php' and os.path.exists(host_file):
-        env['BUILD_INTEROP_DOCKER_EXTRA_ARGS'] = \
-          '-v %s:/root/.composer/auth.json:ro' % host_file
     build_job = jobset.JobSpec(
         cmdline=['tools/run_tests/dockerize/build_interop_image.sh'],
         environ=env,