fix autoloading issue for dialogflow and removes whitespace (GoogleCloudPlatform#977)

Author: bshaffer

dialogflow/composer.json

@@ -29,8 +29,6 @@
         "google/cloud-core": "^1.20"
     },
     "autoload-dev": {
-        "files": [
-            "test/DialogflowTestTrait.php"
-        ]
+        "psr-4": {"Google\\Cloud\\Samples\\Dialogflow\\": "test/"}
     }
 }

dialogflow/dialogflow.php

@@ -41,10 +41,10 @@
         'Text inputs.')
     ->setDescription('Detect intent of text inputs using Dialogflow.')
     ->setHelp(<<
-The %command.name% command detects the intent of provided text 
+The %command.name% command detects the intent of provided text
 using Dialogflow.
 
-    php %command.full_name% PROJECT_ID [-s SESSION_ID] 
+    php %command.full_name% PROJECT_ID [-s SESSION_ID]
     [-l LANGUAGE-CODE] text [texts ...]
 EOF
     )
@@ -68,10 +68,10 @@
     ->addArgument('path', InputArgument::REQUIRED, 'Path to audio file.')
     ->setDescription('Detect intent of audio file using Dialogflow.')
     ->setHelp(<<
-The %command.name% command detects the intent of provided audio 
+The %command.name% command detects the intent of provided audio
 using Dialogflow.
 
-    php %command.full_name% PROJECT_ID [-s SESSION_ID] 
+    php %command.full_name% PROJECT_ID [-s SESSION_ID]
     [-l LANGUAGE-CODE] AUDIO_FILE_PATH
 EOF
     )
@@ -95,10 +95,10 @@
     ->addArgument('path', InputArgument::REQUIRED, 'Path to audio file.')
     ->setDescription('Detect intent of audio stream using Dialogflow.')
     ->setHelp(<<
-The %command.name% command detects the intent of provided text 
+The %command.name% command detects the intent of provided text
 using Dialogflow.
 
-    php %command.full_name% PROJECT_ID -s SESSION_ID 
+    php %command.full_name% PROJECT_ID -s SESSION_ID
     -l LANGUAGE-CODE AUDIO_FILE_PATH
 EOF
     )
@@ -143,7 +143,7 @@
     ->setHelp(<<
 The %command.name% command creates intent of provided display name.
 
-    php %command.full_name% PROJECT_ID DISPLAY_NAME -t training_phrase_part 
+    php %command.full_name% PROJECT_ID DISPLAY_NAME -t training_phrase_part
     [-t trainining_phrase_part ...] -m message_text [-m message_text ...] 
 EOF
     )
@@ -331,7 +331,7 @@
     ->setHelp(<<
 The %command.name% command creates context of provided context id.
 
-    php %command.full_name% PROJECT_ID -s SESSION_ID CONTEXT_ID 
+    php %command.full_name% PROJECT_ID -s SESSION_ID CONTEXT_ID
     -c LIFESPAN_COUNT
 EOF
     )
@@ -401,11 +401,11 @@
         SessionEntityType_EntityOverrideMode::ENTITY_OVERRIDE_MODE_OVERRIDE)
     ->setDescription('Create session entity type.')
     ->setHelp(<<
-The %command.name% command creates session entity type with 
+The %command.name% command creates session entity type with
 display name and values provided.
 
-    php %command.full_name% PROJECT_ID -s SESSION_ID 
-    ENTITY_TYPE_DISPLAY_NAME entity_value [entity_values ...] 
+    php %command.full_name% PROJECT_ID -s SESSION_ID
+    ENTITY_TYPE_DISPLAY_NAME entity_value [entity_values ...]
     -o ENTITY_OVERRIDE_MODE
 EOF
     )
@@ -432,7 +432,7 @@
     ->setHelp(<<
 The %command.name% command deletes specified session entity type.
 
-    php %command.full_name% PROJECT_ID SESSION_ID 
+    php %command.full_name% PROJECT_ID SESSION_ID
      ENTITY_TYPE_DISPLAY_NAME 
 EOF
     )

dialogflow/src/context_create.php

@@ -31,11 +31,11 @@ function context_create($projectId, $contextId, $sessionId, $lifespan = 1)
     $context = new Context();
     $context->setName($contextName);
     $context->setLifespanCount($lifespan);
-    
+
     // create context
     $response = $contextsClient->createContext($parent, $context);
     printf('Context created: %s' . PHP_EOL, $response->getName());
-    
+
     $contextsClient->close();
 }
 // [END dialogflow_create_context]

dialogflow/src/context_delete.php

@@ -23,7 +23,7 @@
 function context_delete($projectId, $contextId, $sessionId)
 {
     $contextsClient = new ContextsClient();
-    
+
     $contextName = $contextsClient->contextName($projectId, $sessionId,
         $contextId);
     $contextsClient->deleteContext($contextName);

dialogflow/src/detect_intent_texts.php

@@ -62,7 +62,7 @@ function detect_intent_texts($projectId, $texts, $sessionId, $languageCode = 'en
         print(PHP_EOL);
         printf('Fulfilment text: %s' . PHP_EOL, $fulfilmentText);
     }
-    
+
     $sessionsClient->close();
 }
 // [END dialogflow_detect_intent_text]

dialogflow/src/entity_delete.php

@@ -26,7 +26,7 @@
 function entity_delete($projectId, $entityTypeId, $entityValue)
 {
     $entityTypesClient = new EntityTypesClient();
-    
+
     $parent = $entityTypesClient->entityTypeName($projectId,
         $entityTypeId);
     $entityTypesClient->batchDeleteEntities($parent, [$entityValue]);

dialogflow/src/entity_list.php

@@ -28,7 +28,7 @@ function entity_list($projectId, $entityTypeId)
     $parent = $entityTypesClient->entityTypeName($projectId,
         $entityTypeId);
     $entityType = $entityTypesClient->getEntityType($parent);
-    
+
     // get entities
     $entities = $entityType->getEntities();
     foreach ($entities as $entity) {

dialogflow/src/entity_type_create.php

@@ -28,7 +28,7 @@
 function entity_type_create($projectId, $displayName, $kind = EntityType_Kind::KIND_MAP)
 {
     $entityTypesClient = new EntityTypesClient();
-    
+
     // prepare entity type
     $parent = $entityTypesClient->projectAgentName($projectId);
     $entityType = new EntityType();

dialogflow/src/entity_type_delete.php

@@ -31,7 +31,7 @@ function entity_type_delete($projectId, $entityTypeId)
         $entityTypeId);
     $entityTypesClient->deleteEntityType($parent);
     printf('Entity type deleted: %s' . PHP_EOL, $parent);
-    
+
     $entityTypesClient->close();
 }
 // [END dialogflow_delete_entity_type]

dialogflow/src/intent_delete.php

@@ -30,7 +30,7 @@ function intent_delete($projectId, $intentId)
 
     $intentsClient->deleteIntent($intentName);
     printf('Intent deleted: %s' . PHP_EOL, $intentName);
-    
+
     $intentsClient->close();
 }
 // [END dialogflow_delete_intent]

dialogflow/src/session_entity_type_create.php

@@ -35,7 +35,7 @@ function session_entity_type_create($projectId, $displayName, $values,
     // prepare name
     $sessionEntityTypeName = $sessionEntityTypesClient
     ->sessionEntityTypeName($projectId, $sessionId, $displayName);
-    
+
     // prepare entities
     $entities = [];
     foreach ($values as $value) {

dialogflow/src/session_entity_type_delete.php

@@ -26,7 +26,7 @@
 function session_entity_type_delete($projectId, $displayName, $sessionId)
 {
     $sessionEntityTypesClient = new SessionEntityTypesClient();
-    
+
     $sessionEntityTypeName = $sessionEntityTypesClient
         ->sessionEntityTypeName($projectId, $sessionId, $displayName);
     $sessionEntityTypesClient->deleteSessionEntityType($sessionEntityTypeName);