chore: upgrade vision samples to new surface

vision/composer.json

@@ -2,7 +2,7 @@
     "name": "google/vision",
     "type": "project",
     "require": {
-        "google/cloud-vision": "^1.0.0",
+        "google/cloud-vision": "^1.7",
         "google/cloud-storage": "^1.20.1"
     }
 }

vision/quickstart.php

@@ -20,7 +20,7 @@
 require __DIR__ . '/vendor/autoload.php';
 
 # imports the Google Cloud client library
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 # instantiates a client
 $imageAnnotator = new ImageAnnotatorClient();

vision/src/detect_document_text.php

@@ -18,7 +18,7 @@
 // [START vision_fulltext_detection]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path Path to the image, e.g. "path/to/your/image.jpg"

vision/src/detect_document_text_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_fulltext_detection_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_face.php

@@ -18,7 +18,7 @@
 namespace Google\Cloud\Samples\Vision;
 
 // [START vision_face_detection_tutorial_imports]
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 // [END vision_face_detection_tutorial_imports]
 /**

vision/src/detect_face_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_face_detection_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_image_property.php

@@ -18,7 +18,7 @@
 // [START vision_image_property_detection]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path Path to the image, e.g. "path/to/your/image.jpg"

vision/src/detect_image_property_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_image_property_detection_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_label.php

@@ -18,7 +18,7 @@
 // [START vision_label_detection]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path Path to the image, e.g. "path/to/your/image.jpg"

vision/src/detect_label_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_label_detection_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_landmark.php

@@ -18,7 +18,7 @@
 // [START vision_landmark_detection]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path Path to the image, e.g. "path/to/your/image.jpg"

vision/src/detect_landmark_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_landmark_detection_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_logo.php

@@ -18,7 +18,7 @@
 // [START vision_logo_detection]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path Path to the image, e.g. "path/to/your/image.jpg"

vision/src/detect_logo_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_logo_detection_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_object.php

@@ -18,7 +18,7 @@
 // [START vision_localize_objects]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path Path to the image, e.g. "path/to/your/image.jpg"

vision/src/detect_object_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_localize_objects_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_pdf_gcs.php

@@ -21,11 +21,12 @@
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Vision\V1\AnnotateFileResponse;
 use Google\Cloud\Vision\V1\AsyncAnnotateFileRequest;
+use Google\Cloud\Vision\V1\AsyncBatchAnnotateFilesRequest;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 use Google\Cloud\Vision\V1\Feature;
 use Google\Cloud\Vision\V1\Feature\Type;
 use Google\Cloud\Vision\V1\GcsDestination;
 use Google\Cloud\Vision\V1\GcsSource;
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
 use Google\Cloud\Vision\V1\InputConfig;
 use Google\Cloud\Vision\V1\OutputConfig;
 
@@ -66,7 +67,9 @@ function detect_pdf_gcs(string $path, string $output)
 
     # make request
     $imageAnnotator = new ImageAnnotatorClient();
-    $operation = $imageAnnotator->asyncBatchAnnotateFiles($requests);
+    $request = (new AsyncBatchAnnotateFilesRequest())
+        ->setRequests($requests);
+    $operation = $imageAnnotator->asyncBatchAnnotateFiles($request);
     print('Waiting for operation to finish.' . PHP_EOL);
     $operation->pollUntilComplete();
 

vision/src/detect_safe_search.php

@@ -18,7 +18,7 @@
 // [START vision_safe_search_detection]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path Path to the image, e.g. "path/to/your/image.jpg"

vision/src/detect_safe_search_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_safe_search_detection_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_text.php

@@ -18,7 +18,7 @@
 // [START vision_text_detection]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path Path to the image, e.g. "path/to/your/image.jpg"

vision/src/detect_text_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_text_detection_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_web.php

@@ -18,7 +18,7 @@
 // [START vision_web_detection]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path Path to the image, e.g. "path/to/your/image.jpg"

vision/src/detect_web_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_web_detection_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 
 /**
  * @param string $path GCS path to the image, e.g. "gs://path/to/your/image.jpg"

vision/src/detect_web_with_geo_metadata.php

@@ -18,7 +18,7 @@
 // [START vision_web_detection_include_geo]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 use Google\Cloud\Vision\V1\ImageContext;
 use Google\Cloud\Vision\V1\WebDetectionParams;
 

vision/src/detect_web_with_geo_metadata_gcs.php

@@ -18,7 +18,7 @@
 // [START vision_web_detection_include_geo_gcs]
 namespace Google\Cloud\Samples\Vision;
 
-use Google\Cloud\Vision\V1\ImageAnnotatorClient;
+use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
 use Google\Cloud\Vision\V1\ImageContext;
 use Google\Cloud\Vision\V1\WebDetectionParams;