adds better CS rules (GoogleCloudPlatform#970)

Author: bshaffer

.php_cs.dist

@@ -6,6 +6,10 @@ return PhpCsFixer\Config::create()
         'concat_space' => ['spacing' => 'one'],
         'no_unused_imports' => true,
         'method_argument_space' => false,
+        'whitespace_after_comma_in_array' => true,
+        'method_argument_space' => [
+            'keep_multiple_spaces_after_comma' => true
+        ],
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()

dialogflow/test/sessionEntityTypeTest.php

@@ -37,7 +37,7 @@ public static function setUpBeforeClass()
 
     public function testCreateSessionEntityType()
     {
-        $response = $this->runCommand('entity-type-create',[
+        $response = $this->runCommand('entity-type-create', [
             'display-name' => self::$entityTypeDisplayName
         ]);
         $this->runCommand('session-entity-type-create', [

spanner/src/read_write_transaction.php

@@ -56,7 +56,7 @@ function read_write_transaction($instanceId, $databaseId)
         $transferAmount = 200000;
 
         // Read the second album's budget.
-        $secondAlbumKey = [2,2];
+        $secondAlbumKey = [2, 2];
         $secondAlbumKeySet = $spanner->keySet(['keys' => [$secondAlbumKey]]);
         $secondAlbumResult = $t->read(
             'Albums',
@@ -74,7 +74,7 @@ function read_write_transaction($instanceId, $databaseId)
             );
         }
 
-        $firstAlbumKey = [1,1];
+        $firstAlbumKey = [1, 1];
         $firstAlbumKeySet = $spanner->keySet(['keys' => [$firstAlbumKey]]);
         $firstAlbumResult = $t->read(
             'Albums',

speech/test/speechTest.php

@@ -54,14 +54,14 @@ public function testTranscribeModel()
             [$path, 'video']
         );
         // $this->assertContains('the weather outside is sunny',$output);
-        $this->assertContains('how old is the Brooklyn Bridge',$output);
+        $this->assertContains('how old is the Brooklyn Bridge', $output);
     }
 
     public function testTranscribePunctuation()
     {
         $path = __DIR__ . '/data/audio32KHz.raw';
         $output = $this->runSnippet('transcribe_auto_punctuation', [$path]);
-        $this->assertContains('How old is the Brooklyn Bridge',$output);
+        $this->assertContains('How old is the Brooklyn Bridge', $output);
     }
 
     /** @dataProvider provideTranscribe */

texttospeech/test/textToSpeechTest.php

@@ -40,7 +40,7 @@ public function testSynthesizeSsml()
             ['<speak>Hello there.</speak>']
         );
         $this->assertContains('Audio content written to', $output);
-        $this->assertGreaterThan(0,filesize('output.mp3'));
+        $this->assertGreaterThan(0, filesize('output.mp3'));
         unlink('output.mp3');
     }
 
@@ -49,7 +49,7 @@ public function testSynthesizeText()
         $output = $this->runSnippet('synthesize_text', ['hello there']);
 
         $this->assertContains('Audio content written to', $output);
-        $this->assertGreaterThan(0,filesize('output.mp3'));
+        $this->assertGreaterThan(0, filesize('output.mp3'));
         unlink('output.mp3');
     }
 
@@ -60,7 +60,7 @@ public function testSynthesizeTextEffectsProfile()
             ['hello there', 'telephony-class-application']
         );
         $this->assertContains('Audio content written to', $output);
-        $this->assertGreaterThan(0,filesize('output.mp3'));
+        $this->assertGreaterThan(0, filesize('output.mp3'));
         unlink('output.mp3');
     }
 
@@ -70,7 +70,7 @@ public function testSynthesizeSsmlFile()
         $output = $this->runSnippet('synthesize_ssml_file', [$path]);
 
         $this->assertContains('Audio content written to', $output);
-        $this->assertGreaterThan(0,filesize('output.mp3'));
+        $this->assertGreaterThan(0, filesize('output.mp3'));
         unlink('output.mp3');
     }
 
@@ -80,7 +80,7 @@ public function testSynthesizeTextFile()
         $output = $this->runSnippet('synthesize_text_file', [$path]);
 
         $this->assertContains('Audio content written to', $output);
-        $this->assertGreaterThan(0,filesize('output.mp3'));
+        $this->assertGreaterThan(0, filesize('output.mp3'));
         unlink('output.mp3');
     }
 
@@ -92,7 +92,7 @@ public function testSynthesizeTextEffectsProfileFile()
             [$path, 'telephony-class-application']
         );
         $this->assertContains('Audio content written to', $output);
-        $this->assertGreaterThan(0,filesize('output.mp3'));
+        $this->assertGreaterThan(0, filesize('output.mp3'));
         unlink('output.mp3');
     }
 }

vision/src/detect_crop_hints.php

@@ -42,7 +42,7 @@ function detect_crop_hints($path)
                 $bounds[] = sprintf('(%d,%d)', $vertex->getX(),
                     $vertex->getY());
             }
-            print('Bounds: ' . join(', ',$bounds) . PHP_EOL);
+            print('Bounds: ' . join(', ', $bounds) . PHP_EOL);
         }
     } else {
         print('No crop hints' . PHP_EOL);

vision/src/detect_crop_hints_gcs.php

@@ -41,7 +41,7 @@ function detect_crop_hints_gcs($path)
                 $bounds[] = sprintf('(%d,%d)', $vertex->getX(),
                     $vertex->getY());
             }
-            print('Bounds: ' . join(', ',$bounds) . PHP_EOL);
+            print('Bounds: ' . join(', ', $bounds) . PHP_EOL);
         }
     } else {
         print('No crop hints' . PHP_EOL);

vision/src/detect_document_text.php

@@ -56,7 +56,7 @@ function detect_document_text($path)
                     $bounds[] = sprintf('(%d,%d)', $vertex->getX(),
                         $vertex->getY());
                 }
-                print('Bounds: ' . join(', ',$bounds) . PHP_EOL);
+                print('Bounds: ' . join(', ', $bounds) . PHP_EOL);
                 print(PHP_EOL);
             }
         }

vision/src/detect_document_text_gcs.php

@@ -55,7 +55,7 @@ function detect_document_text_gcs($path)
                     $bounds[] = sprintf('(%d,%d)', $vertex->getX(),
                         $vertex->getY());
                 }
-                print('Bounds: ' . join(', ',$bounds) . PHP_EOL);
+                print('Bounds: ' . join(', ', $bounds) . PHP_EOL);
 
                 print(PHP_EOL);
             }

vision/src/detect_face.php

@@ -38,7 +38,7 @@ function detect_face($path, $outFile = null)
 
     # names of likelihood from google.cloud.vision.enums
     $likelihoodName = ['UNKNOWN', 'VERY_UNLIKELY', 'UNLIKELY',
-    'POSSIBLE','LIKELY', 'VERY_LIKELY'];
+    'POSSIBLE', 'LIKELY', 'VERY_LIKELY'];
 
     printf("%d faces found:" . PHP_EOL, count($faces));
     foreach ($faces as $face) {
@@ -57,7 +57,7 @@ function detect_face($path, $outFile = null)
         foreach ($vertices as $vertex) {
             $bounds[] = sprintf('(%d,%d)', $vertex->getX(), $vertex->getY());
         }
-        print('Bounds: ' . join(', ',$bounds) . PHP_EOL);
+        print('Bounds: ' . join(', ', $bounds) . PHP_EOL);
         print(PHP_EOL);
     }
     // [END vision_face_detection]