Merge branch 'master' of github.com:solariumphp/solarium

solariumphp · Nov 5, 2020 · 8599c72 · 8599c72
2 parents 61239db + 97704b6
commit 8599c72
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -21,9 +21,9 @@
     },
     "require-dev": {
         "escapestudios/symfony2-coding-standard": "^3.11",
-        "guzzlehttp/guzzle": "^6.5",
+        "guzzlehttp/guzzle": "^7.2",
         "nyholm/psr7": "^1.2",
-        "php-http/guzzle6-adapter": "^2.0",
+        "php-http/guzzle7-adapter": "^0.1",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12",
         "phpstan/phpstan-phpunit": "^0.12",

diff --git a/docs/queries/query-helper/query-helper.md b/docs/queries/query-helper/query-helper.md
@@ -49,7 +49,7 @@ $helper = $query->getHelper();
 $query->createFilterQuery('price')->setQuery($helper->rangeQuery('price', 10, 300));
 
 // add a filterquery to find products in a range of 5km, using the helper to generate the 'geofilt' filter
-$query->createFilterQuery('region')->setQuery($helper->geofilt(45.15, -93.85, 'store', 5));
+$query->createFilterQuery('region')->setQuery($helper->geofilt('store', 45.15, -93.85, 5));
 
 // this executes the query and returns the result
 $resultset = $client->select($query);

diff --git a/examples/6.1.1-psr18-adapter.php b/examples/6.1.1-psr18-adapter.php
@@ -4,7 +4,7 @@
 htmlHeader();
 
 // create a PSR-18 adapter instance
-$httpClient = new Http\Adapter\Guzzle6\Client();
+$httpClient = new Http\Adapter\Guzzle7\Client();
 $factory = new Nyholm\Psr7\Factory\Psr17Factory();
 $adapter = new Solarium\Core\Client\Adapter\Psr18Adapter($httpClient, $factory, $factory);
 

diff --git a/src/Core/Client/Endpoint.php b/src/Core/Client/Endpoint.php
@@ -45,7 +45,7 @@ class Endpoint extends Configurable
      */
     public function __toString()
     {
-        $output = __CLASS__.'::__toString'."\n".'host: '.$this->getHost()."\n".'port: '.$this->getPort()."\n".'path: '.$this->getPath()."\n".'collection: '.$this->getCollection()."\n".'core: '.$this->getCore()."\n".'authentication: '.print_r($this->getAuthentication(), 1);
+        $output = __CLASS__.'::__toString'."\n".'host: '.$this->getHost()."\n".'port: '.$this->getPort()."\n".'path: '.$this->getPath()."\n".'collection: '.$this->getCollection()."\n".'core: '.$this->getCore()."\n".'authentication: '.print_r($this->getAuthentication(), true);
 
         return $output;
     }

diff --git a/src/Core/Client/Request.php b/src/Core/Client/Request.php
@@ -88,7 +88,7 @@ class Request extends Configurable implements RequestParamsInterface
      */
     public function __toString()
     {
-        $output = __CLASS__.'::__toString'."\n".'method: '.$this->getMethod()."\n".'header: '.print_r($this->getHeaders(), 1).'authentication: '.print_r($this->getAuthentication(), 1).'resource: '.$this->getUri()."\n".'resource urldecoded: '.urldecode($this->getUri())."\n".'raw data: '.$this->getRawData()."\n".'file upload: '.$this->getFileUpload()."\n";
+        $output = __CLASS__.'::__toString'."\n".'method: '.$this->getMethod()."\n".'header: '.print_r($this->getHeaders(), true).'authentication: '.print_r($this->getAuthentication(), true).'resource: '.$this->getUri()."\n".'resource urldecoded: '.urldecode($this->getUri())."\n".'raw data: '.$this->getRawData()."\n".'file upload: '.$this->getFileUpload()."\n";
 
         return $output;
     }

diff --git a/tests/Integration/TestClientFactory.php b/tests/Integration/TestClientFactory.php
@@ -2,7 +2,7 @@
 
 namespace Solarium\Tests\Integration;
 
-use Http\Adapter\Guzzle6\Client as GuzzlePsrClient;
+use Http\Adapter\Guzzle7\Client as GuzzlePsrClient;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Solarium\Client;
 use Solarium\Core\Client\Adapter\Curl;