chore: upgrade language samples to new surface (GoogleCloudPlatform#1868)

Author: bshaffer

language/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-language": "^0.28.0",
+        "google/cloud-language": "^0.30.2",
         "google/cloud-storage": "^1.20.1"
     }
 }

language/src/analyze_all.php

@@ -24,10 +24,11 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START analyze_all]
+use Google\Cloud\Language\V1\AnnotateTextRequest;
 use Google\Cloud\Language\V1\AnnotateTextRequest\Features;
+use Google\Cloud\Language\V1\Client\LanguageServiceClient;
 use Google\Cloud\Language\V1\Document;
 use Google\Cloud\Language\V1\Document\Type;
-use Google\Cloud\Language\V1\LanguageServiceClient;
 use Google\Cloud\Language\V1\Entity\Type as EntityType;
 use Google\Cloud\Language\V1\EntityMention\Type as MentionType;
 use Google\Cloud\Language\V1\PartOfSpeech\Tag;
@@ -52,7 +53,10 @@ function analyze_all(string $text): void
         ->setExtractDocumentSentiment(true);
 
     // Collect annotations
-    $response = $languageServiceClient->annotateText($document, $features);
+    $request = (new AnnotateTextRequest())
+        ->setDocument($document)
+        ->setFeatures($features);
+    $response = $languageServiceClient->annotateText($request);
     // Process Entities
     $entities = $response->getEntities();
     foreach ($entities as $entity) {

language/src/analyze_all_from_file.php

@@ -24,10 +24,11 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START analyze_all_from_file]
+use Google\Cloud\Language\V1\AnnotateTextRequest;
 use Google\Cloud\Language\V1\AnnotateTextRequest\Features;
+use Google\Cloud\Language\V1\Client\LanguageServiceClient;
 use Google\Cloud\Language\V1\Document;
 use Google\Cloud\Language\V1\Document\Type;
-use Google\Cloud\Language\V1\LanguageServiceClient;
 use Google\Cloud\Language\V1\Entity\Type as EntityType;
 use Google\Cloud\Language\V1\EntityMention\Type as MentionType;
 use Google\Cloud\Language\V1\PartOfSpeech\Tag;
@@ -52,7 +53,10 @@ function analyze_all_from_file(string $uri): void
         ->setExtractDocumentSentiment(true);
 
     // Collect annotations
-    $response = $languageServiceClient->annotateText($document, $features);
+    $request = (new AnnotateTextRequest())
+        ->setDocument($document)
+        ->setFeatures($features);
+    $response = $languageServiceClient->annotateText($request);
 
     // Process Entities
     $entities = $response->getEntities();

language/src/analyze_entities.php

@@ -24,9 +24,10 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START language_entities_text]
+use Google\Cloud\Language\V1\AnalyzeEntitiesRequest;
+use Google\Cloud\Language\V1\Client\LanguageServiceClient;
 use Google\Cloud\Language\V1\Document;
 use Google\Cloud\Language\V1\Document\Type;
-use Google\Cloud\Language\V1\LanguageServiceClient;
 use Google\Cloud\Language\V1\Entity\Type as EntityType;
 
 /**
@@ -43,7 +44,9 @@ function analyze_entities(string $text): void
         ->setType(Type::PLAIN_TEXT);
 
     // Call the analyzeEntities function
-    $response = $languageServiceClient->analyzeEntities($document, []);
+    $request = (new AnalyzeEntitiesRequest())
+        ->setDocument($document);
+    $response = $languageServiceClient->analyzeEntities($request);
     $entities = $response->getEntities();
     // Print out information about each entity
     foreach ($entities as $entity) {

language/src/analyze_entities_from_file.php

@@ -24,9 +24,10 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START language_entities_gcs]
+use Google\Cloud\Language\V1\AnalyzeEntitiesRequest;
+use Google\Cloud\Language\V1\Client\LanguageServiceClient;
 use Google\Cloud\Language\V1\Document;
 use Google\Cloud\Language\V1\Document\Type;
-use Google\Cloud\Language\V1\LanguageServiceClient;
 use Google\Cloud\Language\V1\Entity\Type as EntityType;
 
 /**
@@ -43,7 +44,9 @@ function analyze_entities_from_file(string $uri): void
         ->setType(Type::PLAIN_TEXT);
 
     // Call the analyzeEntities function
-    $response = $languageServiceClient->analyzeEntities($document, []);
+    $request = (new AnalyzeEntitiesRequest())
+        ->setDocument($document);
+    $response = $languageServiceClient->analyzeEntities($request);
     $entities = $response->getEntities();
     // Print out information about each entity
     foreach ($entities as $entity) {

language/src/analyze_entity_sentiment.php

@@ -24,9 +24,10 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START language_entity_sentiment_text]
+use Google\Cloud\Language\V1\AnalyzeEntitySentimentRequest;
+use Google\Cloud\Language\V1\Client\LanguageServiceClient;
 use Google\Cloud\Language\V1\Document;
 use Google\Cloud\Language\V1\Document\Type;
-use Google\Cloud\Language\V1\LanguageServiceClient;
 use Google\Cloud\Language\V1\Entity\Type as EntityType;
 
 /**
@@ -42,7 +43,9 @@ function analyze_entity_sentiment(string $text): void
         ->setType(Type::PLAIN_TEXT);
 
     // Call the analyzeEntitySentiment function
-    $response = $languageServiceClient->analyzeEntitySentiment($document);
+    $request = (new AnalyzeEntitySentimentRequest())
+        ->setDocument($document);
+    $response = $languageServiceClient->analyzeEntitySentiment($request);
     $entities = $response->getEntities();
     // Print out information about each entity
     foreach ($entities as $entity) {

language/src/analyze_entity_sentiment_from_file.php

@@ -24,9 +24,10 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START language_entity_sentiment_gcs]
+use Google\Cloud\Language\V1\AnalyzeEntitySentimentRequest;
+use Google\Cloud\Language\V1\Client\LanguageServiceClient;
 use Google\Cloud\Language\V1\Document;
 use Google\Cloud\Language\V1\Document\Type;
-use Google\Cloud\Language\V1\LanguageServiceClient;
 use Google\Cloud\Language\V1\Entity\Type as EntityType;
 
 /**
@@ -43,7 +44,9 @@ function analyze_entity_sentiment_from_file(string $uri): void
         ->setType(Type::PLAIN_TEXT);
 
     // Call the analyzeEntitySentiment function
-    $response = $languageServiceClient->analyzeEntitySentiment($document);
+    $request = (new AnalyzeEntitySentimentRequest())
+        ->setDocument($document);
+    $response = $languageServiceClient->analyzeEntitySentiment($request);
     $entities = $response->getEntities();
     // Print out information about each entity
     foreach ($entities as $entity) {

language/src/analyze_sentiment.php

@@ -24,9 +24,10 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START language_sentiment_text]
+use Google\Cloud\Language\V1\AnalyzeSentimentRequest;
+use Google\Cloud\Language\V1\Client\LanguageServiceClient;
 use Google\Cloud\Language\V1\Document;
 use Google\Cloud\Language\V1\Document\Type;
-use Google\Cloud\Language\V1\LanguageServiceClient;
 
 /**
  * @param string $text The text to analyze
@@ -41,7 +42,9 @@ function analyze_sentiment(string $text): void
         ->setType(Type::PLAIN_TEXT);
 
     // Call the analyzeSentiment function
-    $response = $languageServiceClient->analyzeSentiment($document);
+    $request = (new AnalyzeSentimentRequest())
+        ->setDocument($document);
+    $response = $languageServiceClient->analyzeSentiment($request);
     $document_sentiment = $response->getDocumentSentiment();
     // Print document information
     printf('Document Sentiment:' . PHP_EOL);

language/src/analyze_sentiment_from_file.php

@@ -24,9 +24,10 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START language_sentiment_gcs]
+use Google\Cloud\Language\V1\AnalyzeSentimentRequest;
+use Google\Cloud\Language\V1\Client\LanguageServiceClient;
 use Google\Cloud\Language\V1\Document;
 use Google\Cloud\Language\V1\Document\Type;
-use Google\Cloud\Language\V1\LanguageServiceClient;
 
 /**
  * @param string $uri The cloud storage object to analyze (gs://your-bucket-name/your-object-name)
@@ -41,7 +42,9 @@ function analyze_sentiment_from_file(string $uri): void
         ->setType(Type::PLAIN_TEXT);
 
     // Call the analyzeSentiment function
-    $response = $languageServiceClient->analyzeSentiment($document);
+    $request = (new AnalyzeSentimentRequest())
+        ->setDocument($document);
+    $response = $languageServiceClient->analyzeSentiment($request);
     $document_sentiment = $response->getDocumentSentiment();
     // Print document information
     printf('Document Sentiment:' . PHP_EOL);

language/src/analyze_syntax.php

@@ -24,9 +24,10 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START language_syntax_text]
+use Google\Cloud\Language\V1\AnalyzeSyntaxRequest;
+use Google\Cloud\Language\V1\Client\LanguageServiceClient;
 use Google\Cloud\Language\V1\Document;
 use Google\Cloud\Language\V1\Document\Type;
-use Google\Cloud\Language\V1\LanguageServiceClient;
 use Google\Cloud\Language\V1\PartOfSpeech\Tag;
 
 /**
@@ -43,7 +44,9 @@ function analyze_syntax(string $text): void
         ->setType(Type::PLAIN_TEXT);
 
     // Call the analyzeEntities function
-    $response = $languageServiceClient->analyzeSyntax($document, []);
+    $request = (new AnalyzeSyntaxRequest())
+        ->setDocument($document);
+    $response = $languageServiceClient->analyzeSyntax($request);
     $tokens = $response->getTokens();
     // Print out information about each entity
     foreach ($tokens as $token) {