fix createBatch call (#1137)

bshaffer · web-flow · commit c522a3ddf545 · 2017-02-02T14:41:36.000-08:00
diff --git a/examples/batch.php b/examples/batch.php
@@ -58,7 +58,7 @@
  want to execute with keys of our choice - these
  keys will be reflected in the returned array.
 ************************************************/
-$batch = new Google_Http_Batch($client);
+$batch = $service->createBatch();
 $optParams = array('filter' => 'free-ebooks');
 $req1 = $service->volumes->listVolumes('Henry David Thoreau', $optParams);
 $batch->add($req1, "thoreau");
diff --git a/src/Google/Http/Batch.php b/src/Google/Http/Batch.php
@@ -42,10 +42,20 @@ class Google_Http_Batch
   /** @var Google_Client */
   private $client;
 
-  public function __construct(Google_Client $client)
-  {
+  private $rootUrl;
+
+  private $batchPath;
+
+  public function __construct(
+      Google_Client $client,
+      $boundary = false,
+      $rootUrl = null,
+      $batchPath = null
+  ) {
     $this->client = $client;
-    $this->boundary = mt_rand();
+    $this->boundary = $boundary ?: mt_rand();
+    $this->rootUrl = rtrim($rootUrl ?: $this->client->getConfig('base_path'), '/');
+    $this->batchPath = $batchPath ?: self::BATCH_PATH;
   }
 
   public function add(RequestInterface $request, $key = false)
@@ -104,7 +114,7 @@ public function execute()
 
     $body .= "--{$this->boundary}--";
     $body = trim($body);
-    $url = Google_Client::API_BASE_PATH . '/' . self::BATCH_PATH;
+    $url = $this->rootUrl . '/' . $this->batchPath;
     $headers = array(
       'Content-Type' => sprintf('multipart/mixed; boundary=%s', $this->boundary),
       'Content-Length' => strlen($body),
diff --git a/tests/BaseTest.php b/tests/BaseTest.php
@@ -87,7 +87,6 @@ private function createClient()
       $client->setCache($this->getCache());
     }
 
-
     return $client;
   }
 
diff --git a/tests/Google/ServiceTest.php b/tests/Google/ServiceTest.php
@@ -31,8 +31,30 @@ public function isAssociativeArray($array)
   }
 }
 
+class TestService extends Google_Service
+{
+  public $batchPath = 'batch/test';
+}
+
 class Google_ServiceTest extends PHPUnit_Framework_TestCase
 {
+  public function testCreateBatch()
+  {
+    $response = $this->getMock('Psr\Http\Message\ResponseInterface');
+    $client = $this->getMock('Google_Client');
+    $client
+      ->expects($this->once())
+      ->method('execute')
+      ->with($this->callback(function ($request) {
+        $this->assertEquals('/batch/test', $request->getRequestTarget());
+        return $request;
+      }))
+      ->will($this->returnValue($response));
+    $model = new TestService($client);
+    $batch = $model->createBatch();
+    $this->assertInstanceOf('Google_Http_Batch', $batch);
+    $batch->execute();
+  }
 
   public function testModel()
   {

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ private function createClient()`
`87`	`87`	`$client->setCache($this->getCache());`
`88`	`88`	`}`
`89`	`89`
`90`		`-`
`91`	`90`	`return $client;`
`92`	`91`	`}`
`93`	`92`