chore!: promote Vision to v2 (#7904)

* chore!: promote Vision to v2

* fix snippet tests, throw exception in ServiceBuilder

* fix vision tests

* fix cs

* fix phpstan

Author: bshaffer

Core/src/ServiceBuilder.php

@@ -26,13 +26,14 @@
 use Google\Cloud\Logging\LoggingClient;
 use Google\Cloud\PubSub\PubSubClient;
 use Google\Cloud\Spanner\SpannerClient;
-use Google\Cloud\Speech\V2\Client\SpeechClient;
 use Google\Cloud\Speech\SpeechClient as DeprecatedSpeechClient;
+use Google\Cloud\Speech\V2\Client\SpeechClient;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Trace\TraceClient;
 use Google\Cloud\Translate\V2\TranslateClient as DeprecatedTranslateClient;
 use Google\Cloud\Translate\V3\Client\TranslationServiceClient;
-use Google\Cloud\Vision\VisionClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
+use Google\Cloud\Vision\VisionClient as DeprecatedVisionClient;
 use Psr\Cache\CacheItemPoolInterface;
 
 /**
@@ -326,23 +327,19 @@ public function trace(array $config = [])
     }
 
     /**
-     * Google Cloud Vision allows you to understand the content of an image,
-     * classify images into categories, detect text, objects, faces and more.
-     * Find more information at the
-     * [Google Cloud Vision docs](https://cloud.google.com/vision/docs/).
-     *
-     * Example:
-     * ```
-     * $vision = $cloud->vision();
-     * ```
-     *
-     * @param array $config [optional] Configuration options. See
-     *        {@see \Google\Cloud\Core\ServiceBuilder::__construct()} for the available options.
-     * @return VisionClient
+     * @deprecated
+     * @see ImageAnnotatorClient
+     * @throws \BadMethodCallException
      */
     public function vision(array $config = [])
     {
-        return $this->createClient(VisionClient::class, 'vision', $config);
+        if (class_exists(DeprecatedVisionClient::class)) {
+            return $this->createClient(DeprecatedVisionClient::class, 'vision', $config);
+        }
+        throw new \BadMethodCallException(sprintf(
+            'This method is no longer supported, create %s directly instead.',
+            ImageAnnotatorClient::class
+        ));
     }
 
     /**

Core/tests/Snippet/ServiceBuilderTest.php

@@ -28,7 +28,6 @@
 use Google\Cloud\Spanner\SpannerClient;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Trace\TraceClient;
-use Google\Cloud\Vision\VisionClient;
 
 /**
  * @group root
@@ -60,7 +59,6 @@ public function serviceBuilderMethods()
             ['spanner', SpannerClient::class, 'spanner', true],
             ['storage', StorageClient::class, 'storage'],
             ['trace', TraceClient::class, 'trace'],
-            ['vision', VisionClient::class, 'vision'],
         ];
     }
 

Core/tests/Unit/ServiceBuilderTest.php

@@ -27,7 +27,6 @@
 use Google\Cloud\Spanner\SpannerClient;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Core\Tests\Unit\Fixtures;
-use Google\Cloud\Vision\VisionClient;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
@@ -170,9 +169,6 @@ public function serviceProvider()
             ], [
                 'storage',
                 StorageClient::class
-            ], [
-                'vision',
-                VisionClient::class
             ]
         ];
     }

Core/tests/Unit/ServicesNotFoundTest.php

@@ -79,7 +79,6 @@ private static function getApis()
             "Storage",
             "Trace",
             "VideoIntelligence",
-            "Vision",
         ];
     }
 
@@ -94,7 +93,6 @@ public function serviceBuilderMethods()
             ['spanner'],
             ['storage'],
             ['trace'],
-            ['vision'],
         ];
     }
 

Vision/.OwlBot.yaml

@@ -1,4 +1,4 @@
 deep-copy-regex:
-    - source: /google/cloud/vision/v1/.*-php/(.*)
-      dest: /owl-bot-staging/Vision/V1/$1
+    - source: /google/cloud/vision/(v1)/.*-php/(.*)
+      dest: /owl-bot-staging/Vision/$1/$2
 api-name: Vision

Vision/owlbot.py

@@ -1,4 +1,4 @@
-# Copyright 2018 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.
@@ -16,8 +16,9 @@
 
 import logging
 from pathlib import Path
-import synthtool as s
 import subprocess
+
+import synthtool as s
 from synthtool.languages import php
 from synthtool import _tracked_paths
 
@@ -29,65 +30,27 @@
 # Added so that we can pass copy_excludes in the owlbot_main() call
 _tracked_paths.add(src)
 
-# Exclude partial veneer files.
-php.owlbot_main(
-    src=src,
-    dest=dest,
-    copy_excludes=[
-        src / "*/src/V1/ProductSearchClient.php",
-        src / "*/src/V1/ImageAnnotatorClient.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] protect vision backwards compatibility
-
-# format generated clients
-subprocess.run([
-    'git',
-    'apply',
-    '.owlbot/safesearchannotation.patch'])
-
-### [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([
-    'npx',
-    '-y',
-    '-p',
-    '@prettier/plugin-php@^0.16',
+    'npm',
+    'exec',
+    '--yes',
+    '--package=@prettier/plugin-php@^0.16',
+    '--',
     'prettier',
-    '**/Gapic/*',
+    '**/Client/*',
     '--write',
     '--parser=php',
     '--single-quote',
-    '--print-width=80'])
+    '--print-width=120'])