Merge pull request #30 from line/fix/base_uri_handling

Vaduz · web-flow · commit 439e09646de7 · 2016-10-19T16:19:32.000+09:00
Fix the handling to specify endpoint base URI
diff --git a/src/LINEBot.php b/src/LINEBot.php
@@ -51,8 +51,11 @@ public function __construct(HTTPClient $httpClient, array $args)
     {
         $this->httpClient = $httpClient;
         $this->channelSecret = $args['channelSecret'];
-        $this->endpointBase =
-            array_key_exists('endpointBase', $args) && $args['endpointBase'] ?: LINEBot::DEFAULT_ENDPOINT_BASE;
+
+        $this->endpointBase = LINEBot::DEFAULT_ENDPOINT_BASE;
+        if (array_key_exists('endpointBase', $args) && !empty($args['endpointBase'])) {
+            $this->endpointBase = $args['endpointBase'];
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,11 @@ public function __construct(HTTPClient $httpClient, array $args)`
`51`	`51`	`{`
`52`	`52`	`$this->httpClient = $httpClient;`
`53`	`53`	`$this->channelSecret = $args['channelSecret'];`
`54`		`- $this->endpointBase =`
`55`		`- array_key_exists('endpointBase', $args) && $args['endpointBase'] ?: LINEBot::DEFAULT_ENDPOINT_BASE;`
	`54`	`+`
	`55`	`+ $this->endpointBase = LINEBot::DEFAULT_ENDPOINT_BASE;`
	`56`	`+ if (array_key_exists('endpointBase', $args) && !empty($args['endpointBase'])) {`
	`57`	`+ $this->endpointBase = $args['endpointBase'];`
	`58`	`+ }`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`/**`