From cb95668c71dafeaeebbd68f7b7a0e9bdc2b95efe Mon Sep 17 00:00:00 2001 From: Michael Dowling Date: Tue, 26 May 2015 09:47:13 -0700 Subject: [PATCH] Removing mentions of no longer used uri templates --- src/Client.php | 6 +++--- src/ClientInterface.php | 19 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Client.php b/src/Client.php index e950d75e..0b5fa57a 100644 --- a/src/Client.php +++ b/src/Client.php @@ -31,9 +31,8 @@ class Client implements ClientInterface /** * Clients accept an array of constructor parameters. * - * Here's an example of creating a client using an URI template for the - * client's base_uri and an array of default request options to apply - * to each request: + * Here's an example of creating a client using a base_uri and an array of + * default request options to apply to each request: * * $client = new Client([ * 'base_uri' => 'http://www.foo.com/1.0/', @@ -58,6 +57,7 @@ class Client implements ClientInterface * - **: any request option * * @param array $config Client configuration settings. + * * @see \GuzzleHttp\RequestOptions for a list of available request options. */ public function __construct(array $config = []) diff --git a/src/ClientInterface.php b/src/ClientInterface.php index 8660938d..bb4a11cc 100644 --- a/src/ClientInterface.php +++ b/src/ClientInterface.php @@ -40,16 +40,15 @@ interface ClientInterface * * Use an absolute path to override the base path of the client, or a * relative path to append to the base path of the client. The URL can - * contain the query string as well. Use an array to provide a URL - * template and additional variables to use in the URL template expansion. + * contain the query string as well. * - * @param string $method HTTP method - * @param string|array|UriInterface $uri URI or URI template - * @param array $options Request options to apply. + * @param string $method HTTP method + * @param string|UriInterface $uri URI object or string. + * @param array $options Request options to apply. * * @return ResponseInterface */ - public function request($method, $uri = null, array $options = []); + public function request($method, $uri, array $options = []); /** * Create and send an asynchronous HTTP request. @@ -59,13 +58,13 @@ interface ClientInterface * contain the query string as well. Use an array to provide a URL * template and additional variables to use in the URL template expansion. * - * @param string $method HTTP method - * @param string|array|UriInterface $uri URI or URI template - * @param array $options Request options to apply. + * @param string $method HTTP method + * @param string|UriInterface $uri URI object or string. + * @param array $options Request options to apply. * * @return ResponseInterface */ - public function requestAsync($method, $uri = null, array $options = []); + public function requestAsync($method, $uri, array $options = []); /** * Get a client configuration option.