Accomodate Brent's comments.

Author: SurferJeffAtGoogle

language/api/src/AnalyzeEntitiesCommand.php

@@ -20,7 +20,6 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**

language/api/src/AnalyzeEverythingCommand.php

@@ -20,7 +20,6 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**

language/api/src/AnalyzeSentimentCommand.php

@@ -20,7 +20,6 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**

language/api/src/AnalyzeSyntaxCommand.php

@@ -20,7 +20,6 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**

language/api/src/functions/analyze_entities.php

@@ -24,26 +24,22 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START analyze_entities]
-use Google\Cloud\ServiceBuilder;
 use Google\Cloud\NaturalLanguage\NaturalLanguageClient;
 use Google\Cloud\NaturalLanguage\Annotation;
 
 /**
  * Find the entities in text.
  * ```
- * analyze_entities($projectId, 'Do you know the way to San Jose?');
+ * analyze_entities('Do you know the way to San Jose?');
  * ```.
  *
- * @param string $projectId The Google project ID.
  * @param string $text The text to analyze.
  *
  * @return Annotation
  */
 function analyze_entities($text, $options = [])
 {
-    $builder = new ServiceBuilder();
-    /** @var NaturalLanguageClient $language */
-    $language = $builder->naturalLanguage();
+    $language = new NaturalLanguageClient();
     $annotation = $language->analyzeEntities($text);
     return $annotation;
 }

language/api/src/functions/analyze_everything.php

@@ -24,26 +24,22 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START analyze_everything]
-use Google\Cloud\ServiceBuilder;
 use Google\Cloud\NaturalLanguage\NaturalLanguageClient;
 use Google\Cloud\NaturalLanguage\Annotation;
 
 /**
  * Find the everything in text.
  * ```
- * analyze_everything($projectId, 'Do you know the way to San Jose?');
+ * analyze_everything('Do you know the way to San Jose?');
  * ```.
  *
- * @param string $projectId The Google project ID.
  * @param string $text The text to analyze.
  *
  * @return Annotation
  */
 function analyze_everything($text, $options = [])
 {
-    $builder = new ServiceBuilder();
-    /** @var NaturalLanguageClient $language */
-    $language = $builder->naturalLanguage();
+    $language = new NaturalLanguageClient();
     $annotation = $language->annotateText($text, [
         'features' => ['entities', 'syntax', 'sentiment']
     ]);

language/api/src/functions/analyze_sentiment.php

@@ -24,26 +24,22 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START analyze_sentiment]
-use Google\Cloud\ServiceBuilder;
 use Google\Cloud\NaturalLanguage\NaturalLanguageClient;
 use Google\Cloud\NaturalLanguage\Annotation;
 
 /**
  * Find the sentiment in text.
  * ```
- * analyze_sentiment($projectId, 'Do you know the way to San Jose?');
+ * analyze_sentiment('Do you know the way to San Jose?');
  * ```.
  *
- * @param string $projectId The Google project ID.
  * @param string $text The text to analyze.
  *
  * @return Annotation
  */
 function analyze_sentiment($text, $options = [])
 {
-    $builder = new ServiceBuilder();
-    /** @var NaturalLanguageClient $language */
-    $language = $builder->naturalLanguage();
+    $language = new NaturalLanguageClient();
     $annotation = $language->analyzeSentiment($text);
     return $annotation;
 }

language/api/src/functions/analyze_syntax.php

@@ -24,26 +24,22 @@
 namespace Google\Cloud\Samples\Language;
 
 # [START analyze_syntax]
-use Google\Cloud\ServiceBuilder;
 use Google\Cloud\NaturalLanguage\NaturalLanguageClient;
 use Google\Cloud\NaturalLanguage\Annotation;
 
 /**
  * Find the syntax in text.
  * ```
- * analyze_syntax($projectId, 'Do you know the way to San Jose?');
+ * analyze_syntax('Do you know the way to San Jose?');
  * ```.
  *
- * @param string $projectId The Google project ID.
  * @param string $text The text to analyze.
  *
  * @return Annotation
  */
 function analyze_syntax($text, $options = [])
 {
-    $builder = new ServiceBuilder();
-    /** @var NaturalLanguageClient $language */
-    $language = $builder->naturalLanguage();
+    $language = new NaturalLanguageClient();
     $annotation = $language->analyzeSyntax($text);
     return $annotation;
 }