forked from solariumphp/solarium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request solariumphp#477 from solariumphp/develop
Merging develop to master for new release
- Loading branch information
Showing
14 changed files
with
1,180 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
| <?php | ||
| /** | ||
| * Copyright 2011 Bas de Nooijer. All rights reserved. | ||
| * * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this listof conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| * | ||
| * The views and conclusions contained in the software and documentation are | ||
| * those of the authors and should not be interpreted as representing official | ||
| * policies, either expressed or implied, of the copyright holder. | ||
| * | ||
| * @copyright Copyright 2011 Bas de Nooijer <[email protected]> | ||
| * @license http://github.com/basdenooijer/solarium/raw/master/COPYING | ||
| * | ||
| * @link http://www.solarium-project.org/ | ||
| */ | ||
|
|
||
| namespace Solarium\Core\Client\Adapter; | ||
|
|
||
| use GuzzleHttp\Client as GuzzleClient; | ||
| use GuzzleHttp\RequestOptions; | ||
| use Solarium\Core\Configurable; | ||
| use Solarium\Core\Client\Request; | ||
| use Solarium\Core\Client\Response; | ||
| use Solarium\Core\Client\Endpoint; | ||
| use Solarium\Exception\HttpException; | ||
|
|
||
| /** | ||
| * Guzzle HTTP adapter. | ||
| */ | ||
| class Guzzle extends Configurable implements AdapterInterface | ||
| { | ||
| /** | ||
| * The Guzzle HTTP client instance. | ||
| * | ||
| * @var GuzzleClient | ||
| */ | ||
| private $guzzleClient; | ||
|
|
||
| /** | ||
| * Execute a Solr request using the cURL Http. | ||
| * | ||
| * @param Request $request The incoming Solr request. | ||
| * @param Endpoint $endpoint The configured Solr endpoint. | ||
| * | ||
| * @return Response | ||
| * | ||
| * @throws HttpException Thrown if solr request connot be made. | ||
| * | ||
| * @codingStandardsIgnoreStart AdapterInterface does not declare type-hints | ||
| */ | ||
| public function execute($request, $endpoint) | ||
| { | ||
| //@codingStandardsIgnoreEnd | ||
| $requestOptions = [ | ||
| RequestOptions::HEADERS => $this->getRequestHeaders($request), | ||
| RequestOptions::BODY => $this->getRequestBody($request), | ||
| RequestOptions::TIMEOUT => $endpoint->getTimeout(), | ||
| ]; | ||
|
|
||
| // Try endpoint authentication first, fallback to request for backwards compatibility | ||
| $authData = $endpoint->getAuthentication(); | ||
| if (empty($authData['username'])) { | ||
| $authData = $request->getAuthentication(); | ||
| } | ||
|
|
||
| if (!empty($authData['username']) && !empty($authData['password'])) { | ||
| $requestOptions[RequestOptions::AUTH] = [$authData['username'], $authData['password']]; | ||
| } | ||
|
|
||
| try { | ||
| $guzzleResponse = $this->getGuzzleClient()->request( | ||
| $request->getMethod(), | ||
| $endpoint->getBaseUri() . $request->getUri(), | ||
| $requestOptions | ||
| ); | ||
|
|
||
| $responseHeaders = [ | ||
| "HTTP/{$guzzleResponse->getProtocolVersion()} {$guzzleResponse->getStatusCode()} " | ||
| . $guzzleResponse->getReasonPhrase(), | ||
| ]; | ||
|
|
||
| foreach ($guzzleResponse->getHeaders() as $key => $value) { | ||
| $responseHeaders[] = "{$key}: " . implode(', ', $value); | ||
| } | ||
|
|
||
| return new Response((string)$guzzleResponse->getBody(), $responseHeaders); | ||
| } catch (\GuzzleHttp\Exception\RequestException $e) { | ||
| $error = $e->getMessage(); | ||
| throw new HttpException("HTTP request failed, {$error}"); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Gets the Guzzle HTTP client instance. | ||
| * | ||
| * @return GuzzleClient | ||
| */ | ||
| public function getGuzzleClient() | ||
| { | ||
| if ($this->guzzleClient === null) { | ||
| $this->guzzleClient = new GuzzleClient($this->options); | ||
| } | ||
|
|
||
| return $this->guzzleClient; | ||
| } | ||
|
|
||
| /** | ||
| * Helper method to create a request body suitable for a guzzle 3 request. | ||
| * | ||
| * @param Request $request The incoming solarium request. | ||
| * | ||
| * @return null|resource|string | ||
| */ | ||
| private function getRequestBody(Request $request) | ||
| { | ||
| if ($request->getMethod() !== Request::METHOD_POST) { | ||
| return null; | ||
| } | ||
|
|
||
| if ($request->getFileUpload()) { | ||
| return fopen($request->getFileUpload(), 'r'); | ||
| } | ||
|
|
||
| return $request->getRawData(); | ||
| } | ||
|
|
||
| /** | ||
| * Helper method to extract headers from the incoming solarium request and put them in a format | ||
| * suitable for a guzzle 3 request. | ||
| * | ||
| * @param Request $request The incoming solarium request. | ||
| * | ||
| * @return array | ||
| */ | ||
| private function getRequestHeaders(Request $request) | ||
| { | ||
| $headers = []; | ||
| foreach ($request->getHeaders() as $headerLine) { | ||
| list($header, $value) = explode(':', $headerLine); | ||
| if ($header = trim($header)) { | ||
| $headers[$header] = trim($value); | ||
| } | ||
| } | ||
|
|
||
| if (!isset($headers['Content-Type'])) { | ||
| if ($request->getMethod() == Request::METHOD_GET) { | ||
| $headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'; | ||
| } else { | ||
| $headers['Content-Type'] = 'application/xml; charset=utf-8'; | ||
| } | ||
| } | ||
|
|
||
| return $headers; | ||
| } | ||
| } |
Oops, something went wrong.