chore!: promote Translate to v2

Core/src/ServiceBuilder.php

@@ -29,7 +29,8 @@
 use Google\Cloud\Speech\SpeechClient;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Trace\TraceClient;
-use Google\Cloud\Translate\V2\TranslateClient;
+use Google\Cloud\Translate\V2\TranslateClient as DeprecatedTranslateClient;
+use Google\Cloud\Translate\V3\Client\TranslationServiceClient;
 use Google\Cloud\Vision\VisionClient;
 use Psr\Cache\CacheItemPoolInterface;
 
@@ -356,51 +357,19 @@ public function vision(array $config = [])
     }
 
     /**
-     * Google Cloud Translation provides the ability to dynamically translate
-     * text between thousands of language pairs and lets websites and programs
-     * integrate with translation service programmatically.
-     *
-     * The Google Cloud Translation API is available as a paid
-     * service. See the [Pricing](https://cloud.google.com/translation/v2/pricing)
-     * and [FAQ](https://cloud.google.com/translation/v2/faq) pages for details.
-     * Find more information at the the
-     * [Google Cloud Translation docs](https://cloud.google.com/translation/docs/).
-     *
-     * Please note that while the Google Cloud Translation API supports
-     * authentication via service account and application default credentials
-     * like other Cloud Platform APIs, it also supports authentication via a
-     * public API access key. If you wish to authenticate using an API key,
-     * follow the
-     * [before you begin](https://cloud.google.com/translation/v2/translating-text-with-rest#before-you-begin)
-     * instructions to learn how to generate a key.
-     *
-     * Example:
-     * ```
-     * use Google\Cloud\Core\ServiceBuilder;
-     *
-     * $builder = new ServiceBuilder([
-     *     'key' => 'YOUR_KEY'
-     * ]);
-     *
-     * $translate = $builder->translate();
-     * ```
-     *
-     * @param array $config [optional] {
-     *     Configuration options.
-     *
-     *     @type string $key A public API access key.
-     *     @type string $target The target language to assign to the client.
-     *           Defaults to `en` (English).
-     *     @type callable $httpHandler A handler used to deliver Psr7 requests.
-     *           Only valid for requests sent over REST.
-     *     @type int $retries Number of retries for a failed request.
-     *           **Defaults to** `3`.
-     * }
-     * @return TranslateClient
+     * @deprecated
+     * @see TranslationServiceClient
+     * @throws \BadMethodCallException
      */
     public function translate(array $config = [])
     {
-        return $this->createClient(TranslateClient::class, 'translate', $config);
+        if (class_exists(DeprecatedTranslateClient::class)) {
+            return $this->createClient(DeprecatedTranslateClient::class, 'translate', $config);
+        }
+        throw new \BadMethodCallException(sprintf(
+            'This method is no longer supported, create %s directly instead.',
+            TranslationServiceClient::class
+        ));
     }
 
     /**

Core/tests/Snippet/ServiceBuilderTest.php

@@ -29,7 +29,6 @@
 use Google\Cloud\Speech\SpeechClient;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Trace\TraceClient;
-use Google\Cloud\Translate\TranslateClient;
 use Google\Cloud\Vision\VisionClient;
 
 /**
@@ -64,7 +63,6 @@ public function serviceBuilderMethods()
             ['storage', StorageClient::class, 'storage'],
             ['trace', TraceClient::class, 'trace'],
             ['vision', VisionClient::class, 'vision'],
-            ['translate', TranslateClient::class, 'translate']
         ];
     }
 

Core/tests/Unit/ServiceBuilderTest.php

@@ -28,7 +28,6 @@
 use Google\Cloud\Speech\SpeechClient;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Core\Tests\Unit\Fixtures;
-use Google\Cloud\Translate\TranslateClient;
 use Google\Cloud\Vision\VisionClient;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;
@@ -68,17 +67,6 @@ public function testBuildsClients($serviceName, $expectedClient, array $args = [
         $this->assertInstanceOf($expectedClient, $localConfigClient);
     }
 
-    public function testTranslateClientWithApiKey()
-    {
-        $this->checkAndSkipTest([TranslateClient::class]);
-
-        $config = ['key' => 'test_key'];
-        $serviceBuilder = new ServiceBuilder($config);
-
-        $this->assertInstanceOf(TranslateClient::class, $serviceBuilder->translate());
-        $this->assertInstanceOf(TranslateClient::class, $serviceBuilder->translate($config));
-    }
-
     /**
      * @dataProvider serviceProvider
      */
@@ -187,9 +175,6 @@ public function serviceProvider()
             ], [
                 'storage',
                 StorageClient::class
-            ], [
-                'translate',
-                TranslateClient::class
             ], [
                 'vision',
                 VisionClient::class

Core/tests/Unit/ServicesNotFoundTest.php

@@ -74,7 +74,6 @@ private static function getApis()
             "Speech",
             "Storage",
             "Trace",
-            "Translate",
             "VideoIntelligence",
             "Vision",
         ];
@@ -93,7 +92,6 @@ public function serviceBuilderMethods()
             ['storage'],
             ['trace'],
             ['vision'],
-            ['translate']
         ];
     }
 

Translate/owlbot.py

@@ -1,4 +1,4 @@
-# Copyright 2019 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,41 +30,27 @@
 # Added so that we can pass copy_excludes in the owlbot_main() call
 _tracked_paths.add(src)
 
-php.owlbot_main(
-    src=src,
-    dest=dest,
-    copy_excludes=[
-        src / "*/src/V2/TranslateClient.php"
-    ]
-)
-# Change the wording for the deprecation warning.
-s.replace(
-    'src/*/*_*.php',
-    r'will be removed in the next major release',
-    'will be removed in a future release')
-
-### [START] protoc backwards compatibility fixes
-
-# roll back to private properties.
-s.replace(
-    "src/**/V*/**/*.php",
-    r"Generated from protobuf field ([^\n]{0,})\n\s{5}\*/\n\s{4}protected \$",
-    r"""Generated from protobuf field \1
-     */
-    private $""")
-
-# Replace "Unwrapped" with "Value" for method names.
-s.replace(
-    "src/**/V*/**/*.php",
-    r"public function ([s|g]\w{3,})Unwrapped",
-    r"public function \1Value"
-)
-
-### [END] protoc backwards compatibility fixes
+php.owlbot_main(src=src, dest=dest)
 
-# fix relative cloud.google.com links
+# remove class_alias code
 s.replace(
-    "src/**/V*/**/*.php",
-    r"(.{0,})\]\((/.{0,})\)",
-    r"\1](https://cloud.google.com\2)"
-)
+    "src/V*/**/*.php",
+    r"^// Adding a class alias for backwards compatibility with the previous class name.$"
+    + "\n"
+    + r"^class_alias\(.*\);$"
+    + "\n",
+    '')
+
+# format generated clients
+subprocess.run([
+    'npm',
+    'exec',
+    '--yes',
+    '--package=@prettier/plugin-php@^0.16',
+    '--',
+    'prettier',
+    '**/Client/*',
+    '--write',
+    '--parser=php',
+    '--single-quote',
+    '--print-width=120'])