chore: update firestore ineq sample to use cities (GoogleCloudPlatform#2036)

Author: bshaffer

firestore/src/data_get_dataset.php

@@ -43,35 +43,41 @@ function data_get_dataset(string $projectId): void
         'state' => 'CA',
         'country' => 'USA',
         'capital' => false,
-        'population' => 860000
+        'population' => 860000,
+        'density' => 18000,
     ]);
     $citiesRef->document('LA')->set([
         'name' => 'Los Angeles',
         'state' => 'CA',
         'country' => 'USA',
         'capital' => false,
-        'population' => 3900000
+        'population' => 3900000,
+        'density' => 8000,
     ]);
     $citiesRef->document('DC')->set([
         'name' => 'Washington D.C.',
         'state' => null,
         'country' => 'USA',
         'capital' => true,
-        'population' => 680000
+        'population' => 680000,
+        'density' => 11000,
     ]);
     $citiesRef->document('TOK')->set([
         'name' => 'Tokyo',
         'state' => null,
         'country' => 'Japan',
         'capital' => true,
-        'population' => 9000000
+        'population' => 9000000,
+        'density' => 16000,
+
     ]);
     $citiesRef->document('BJ')->set([
         'name' => 'Beijing',
         'state' => null,
         'country' => 'China',
         'capital' => true,
-        'population' => 21500000
+        'population' => 21500000,
+        'density' => 3500,
     ]);
     printf('Added example cities data to the cities collection.' . PHP_EOL);
     # [END firestore_data_get_dataset]

firestore/src/query_filter_compound_multi_ineq.php

@@ -37,22 +37,17 @@ function query_filter_compound_multi_ineq(string $projectId): void
     $db = new FirestoreClient([
         'projectId' => $projectId,
     ]);
-    $collection = $db->collection('samples/php/users');
-    // Setup the data before querying for it
-    $collection->document('person1')->set(['age' => 23, 'height' => 65]);
-    $collection->document('person2')->set(['age' => 37, 'height' => 55]);
-    $collection->document('person3')->set(['age' => 40, 'height' => 75]);
-    $collection->document('person4')->set(['age' => 40, 'height' => 65]);
+    $collection = $db->collection('samples/php/cities');
 
     # [START firestore_query_filter_compound_multi_ineq]
     $chainedQuery = $collection
-        ->where('age', '>', 35)
-        ->where('height', '>', 60)
-        ->where('height', '<', 70);
+        ->where('population', '>', 1000000)
+        ->where('density', '<', 10000);
+
     # [END firestore_query_filter_compound_multi_ineq]
     foreach ($chainedQuery->documents() as $document) {
         printf(
-            'Document %s returned by age > 35 and height between 60 and 70' . PHP_EOL,
+            'Document %s returned by population > 1000000 and density < 10000' . PHP_EOL,
             $document->id()
         );
     }

firestore/src/query_filter_dataset.php

@@ -44,6 +44,7 @@ function query_filter_dataset(string $projectId): void
         'country' => 'USA',
         'capital' => false,
         'population' => 860000,
+        'density' => 18000,
         'regions' => ['west_coast', 'norcal']
     ]);
     $citiesRef->document('LA')->set([
@@ -52,6 +53,7 @@ function query_filter_dataset(string $projectId): void
         'country' => 'USA',
         'capital' => false,
         'population' => 3900000,
+        'density' => 8000,
         'regions' => ['west_coast', 'socal']
     ]);
     $citiesRef->document('DC')->set([
@@ -60,6 +62,7 @@ function query_filter_dataset(string $projectId): void
         'country' => 'USA',
         'capital' => true,
         'population' => 680000,
+        'density' => 11000,
         'regions' => ['east_coast']
     ]);
     $citiesRef->document('TOK')->set([
@@ -68,6 +71,7 @@ function query_filter_dataset(string $projectId): void
         'country' => 'Japan',
         'capital' => true,
         'population' => 9000000,
+        'density' => 16000,
         'regions' => ['kanto', 'honshu']
     ]);
     $citiesRef->document('BJ')->set([
@@ -76,6 +80,7 @@ function query_filter_dataset(string $projectId): void
         'country' => 'China',
         'capital' => true,
         'population' => 21500000,
+        'density' => 3500,
         'regions' => ['jingjinji', 'hebei']
     ]);
     printf('Added example cities data to the cities collection.' . PHP_EOL);

firestore/test/firestoreTest.php

@@ -277,7 +277,8 @@ public function testChainedQuery()
     public function testChainedInequalityQuery()
     {
         $output = $this->runFirestoreSnippet('query_filter_compound_multi_ineq');
-        $this->assertStringContainsString('Document person4 returned by age > 35 and height between 60 and 70', $output);
+        $this->assertStringContainsString('Document LA returned by population > 1000000 and density < 10000', $output);
+        $this->assertStringContainsString('Document BJ returned by population > 1000000 and density < 10000', $output);
     }
 
     /**