Drop PHP 8.0 support

Author: thomascorthals

.github/workflows/run-tests.yml

@@ -14,7 +14,7 @@ jobs:
 
         strategy:
             matrix:
-                php: [8.0, 8.1, 8.2, 8.3, 8.4]
+                php: [8.1, 8.2, 8.3, 8.4]
                 solr: [7, 8, 9]
                 mode: [cloud, server]
 

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to the Solarium library will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Removed
+- PHP 8.0 support
+
 ## [6.3.6]
 ### Added
 - PHP 8.4 support

README.md

@@ -10,7 +10,7 @@ Please see the [docs](http://solarium.readthedocs.io/en/stable/) for a more deta
 
 ## Requirements
 
-Solarium 6.3.2 and up only supports PHP 8.0 and up.
+Solarium 6.3.7 and up only supports PHP 8.1 and up.
 
 It's highly recommended to have cURL enabled in your PHP environment. However if you don't have cURL available you can
 switch from using cURL (the default) to a pure PHP based HTTP client adapter which works for the essential stuff but

src/Core/Query/AbstractRequestBuilder.php

@@ -28,7 +28,7 @@ abstract class AbstractRequestBuilder implements RequestBuilderInterface
     /**
      * Build request for a select query.
      *
-     * @param AbstractQuery|QueryInterface $query
+     * @param AbstractQuery&QueryInterface $query
      *
      * @return Request
      */

src/QueryType/Analysis/RequestBuilder/Document.php

@@ -23,7 +23,7 @@ class Document extends BaseRequestBuilder
     /**
      * Build request for an analysis document query.
      *
-     * @param AbstractQuery|QueryInterface|QueryDocument $query
+     * @param QueryInterface&QueryDocument $query
      *
      * @return Request
      */

src/QueryType/Analysis/RequestBuilder/Field.php

@@ -22,7 +22,7 @@ class Field extends RequestBuilder
     /**
      * Build request for an analysis field query.
      *
-     * @param QueryInterface|QueryField $query
+     * @param QueryInterface&QueryField $query
      *
      * @return Request
      */

src/QueryType/Analysis/RequestBuilder/RequestBuilder.php

@@ -13,6 +13,7 @@
 use Solarium\Core\Query\AbstractQuery;
 use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
 use Solarium\Core\Query\QueryInterface;
+use Solarium\QueryType\Analysis\Query\AbstractQuery as AbstractAnalysisQuery;
 
 /**
  * Build an analysis request.
@@ -22,13 +23,13 @@ class RequestBuilder extends BaseRequestBuilder
     /**
      * Build request for an analysis query.
      *
-     * @param QueryInterface|AbstractQuery $query
+     * @param QueryInterface&AbstractAnalysisQuery $query
      *
      * @return Request
      */
     public function build(AbstractQuery $query): Request
     {
-        /** @var \Solarium\QueryType\Analysis\Query\AbstractQuery $query */
+        /** @var AbstractAnalysisQuery $query */
         $request = parent::build($query);
         $request->addParam('analysis.query', $query->getQuery());
         $request->addParam('analysis.showmatch', $query->getShowMatch());

src/QueryType/Extract/RequestBuilder.php

@@ -23,7 +23,7 @@ class RequestBuilder extends BaseRequestBuilder
     /**
      * Build the request.
      *
-     * @param Query|QueryInterface $query
+     * @param QueryInterface&Query $query
      *
      * @throws RuntimeException
      *

src/QueryType/Luke/RequestBuilder.php

@@ -22,7 +22,7 @@ class RequestBuilder extends AbstractRequestBuilder
     /**
      * Build request for a Luke query.
      *
-     * @param QueryInterface|Query $query
+     * @param QueryInterface&Query $query
      *
      * @return Request
      */

src/QueryType/ManagedResources/RequestBuilder/Resource.php

@@ -12,6 +12,7 @@
 use Solarium\Core\Client\Request;
 use Solarium\Core\Query\AbstractQuery;
 use Solarium\Core\Query\AbstractRequestBuilder;
+use Solarium\Core\Query\QueryInterface;
 use Solarium\Exception\RuntimeException;
 use Solarium\QueryType\ManagedResources\Query\AbstractCommand;
 use Solarium\QueryType\ManagedResources\Query\AbstractQuery as BaseQuery;
@@ -24,11 +25,11 @@ class Resource extends AbstractRequestBuilder
     /**
      * Build request for a resource query.
      *
-     * @param \Solarium\Core\Query\AbstractQuery $query
+     * @param QueryInterface&BaseQuery $query
      *
-     * @throws \Solarium\Exception\RuntimeException
+     * @throws RuntimeException
      *
-     * @return \Solarium\Core\Client\Request
+     * @return Request
      */
     public function build(AbstractQuery $query): Request
     {
@@ -56,10 +57,10 @@ public function build(AbstractQuery $query): Request
     }
 
     /**
-     * @param \Solarium\Core\Client\Request                              $request
-     * @param \Solarium\QueryType\ManagedResources\Query\AbstractCommand $command
+     * @param Request         $request
+     * @param AbstractCommand $command
      *
-     * @throws \Solarium\Exception\RuntimeException
+     * @throws RuntimeException
      *
      * @return self Provides fluent interface
      */

src/QueryType/ManagedResources/Result/Resources/ResourceList.php

@@ -13,6 +13,7 @@
 use Solarium\Core\Query\AbstractQuery;
 use Solarium\Core\Query\Result\QueryType as BaseResult;
 use Solarium\Core\Query\Result\Result;
+use Solarium\QueryType\ManagedResources\Result\Resources\Resource as ManagedResource;
 
 /**
  * ResourceList.
@@ -29,15 +30,15 @@ class ResourceList extends BaseResult implements \IteratorAggregate, \Countable
     /**
      * List items.
      *
-     * @var \Solarium\QueryType\ManagedResources\Result\Resources\Resource[]
+     * @var ManagedResource[]
      */
     protected $items = [];
 
     /**
      * Constructor.
      *
-     * @param \Solarium\Core\Query\AbstractQuery $query
-     * @param \Solarium\Core\Client\Response     $response
+     * @param AbstractQuery $query
+     * @param Response      $response
      */
     public function __construct(AbstractQuery $query, Response $response)
     {
@@ -57,7 +58,7 @@ public function getName(): string
     /**
      * Get all items.
      *
-     * @return \Solarium\QueryType\ManagedResources\Result\Resources\Resource[]
+     * @return ManagedResource[]
      */
     public function getItems(): array
     {

src/QueryType/ManagedResources/Result/Stopwords/WordSet.php

@@ -67,8 +67,8 @@ class WordSet extends BaseResult implements \IteratorAggregate, \Countable
     /**
      * Constructor.
      *
-     * @param \Solarium\Core\Query\AbstractQuery $query
-     * @param \Solarium\Core\Client\Response     $response
+     * @param AbstractQuery $query
+     * @param Response      $response
      */
     public function __construct(AbstractQuery $query, Response $response)
     {

src/QueryType/ManagedResources/Result/Synonyms/SynonymMappings.php

@@ -74,8 +74,8 @@ class SynonymMappings extends BaseResult implements \IteratorAggregate, \Countab
     /**
      * Constructor.
      *
-     * @param \Solarium\Core\Query\AbstractQuery $query
-     * @param \Solarium\Core\Client\Response     $response
+     * @param AbstractQuery $query
+     * @param Response      $response
      */
     public function __construct(AbstractQuery $query, Response $response)
     {

src/QueryType/MoreLikeThis/RequestBuilder.php

@@ -22,7 +22,7 @@ class RequestBuilder extends SelectRequestBuilder
     /**
      * Build request for a MoreLikeThis query.
      *
-     * @param QueryInterface|Query $query
+     * @param QueryInterface&Query $query
      *
      * @return Request
      */

src/QueryType/Ping/RequestBuilder.php

@@ -22,7 +22,7 @@ class RequestBuilder extends BaseRequestBuilder
     /**
      * Build request for a ping query.
      *
-     * @param QueryInterface|Query $query
+     * @param QueryInterface&Query $query
      *
      * @return Request
      */

src/QueryType/RealtimeGet/RequestBuilder.php

@@ -22,7 +22,7 @@ class RequestBuilder extends BaseRequestBuilder
     /**
      * Build request for a ping query.
      *
-     * @param QueryInterface|Query $query
+     * @param QueryInterface&Query $query
      *
      * @return Request
      */

src/QueryType/Server/Api/RequestBuilder.php

@@ -23,7 +23,7 @@ class RequestBuilder extends BaseRequestBuilder
     /**
      * Build request for a API query.
      *
-     * @param QueryInterface|ApiQuery $query
+     * @param QueryInterface&ApiQuery $query
      *
      * @return Request
      */

src/QueryType/Server/Configsets/Query/Query.php

@@ -22,7 +22,7 @@
 use Solarium\QueryType\Server\Query\ResponseParser;
 
 /**
- * Collections query.
+ * Configsets query.
  *
  * Can be used to perform an action on the Configsets API admin endpoint
  */

src/QueryType/Server/Configsets/RequestBuilder.php

@@ -11,18 +11,20 @@
 
 use Solarium\Core\Client\Request;
 use Solarium\Core\Query\AbstractQuery;
+use Solarium\Core\Query\QueryInterface;
 use Solarium\QueryType\Server\Configsets\Query\Action\Upload;
+use Solarium\QueryType\Server\Configsets\Query\Query as ConfigsetsQuery;
 use Solarium\QueryType\Server\Query\RequestBuilder as ServerRequestBuilder;
 
 /**
- * Build an Configsets API request.
+ * Build a Configsets API request.
  */
 class RequestBuilder extends ServerRequestBuilder
 {
     /**
      * Build request for an API query.
      *
-     * @param \Solarium\Core\Query\AbstractQuery $query
+     * @param QueryInterface|ConfigsetsQuery $query
      *
      * @return Request
      */

src/QueryType/Server/Query/RequestBuilder.php

@@ -12,6 +12,8 @@
 use Solarium\Core\Client\Request;
 use Solarium\Core\Query\AbstractQuery;
 use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
+use Solarium\Core\Query\QueryInterface;
+use Solarium\QueryType\Server\AbstractServerQuery;
 use Solarium\QueryType\Server\Query\Action\ActionInterface;
 
 /**
@@ -22,7 +24,7 @@ class RequestBuilder extends BaseRequestBuilder
     /**
      * Build request for an API query.
      *
-     * @param \Solarium\Core\Query\AbstractQuery $query
+     * @param QueryInterface&AbstractServerQuery $query
      *
      * @return Request
      */

src/QueryType/Spellcheck/RequestBuilder.php

@@ -13,6 +13,7 @@
 use Solarium\Core\Client\Request;
 use Solarium\Core\Query\AbstractQuery;
 use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
+use Solarium\Core\Query\QueryInterface;
 
 /**
  * Build a Spellcheck query request.
@@ -22,7 +23,7 @@ class RequestBuilder extends BaseRequestBuilder
     /**
      * Build request for a Spellcheck query.
      *
-     * @param \Solarium\Core\Query\AbstractQuery $query
+     * @param QueryInterface&Query $query
      *
      * @return Request
      */

src/QueryType/Stream/RequestBuilder.php

@@ -11,6 +11,7 @@
 
 use Solarium\Core\Client\Request;
 use Solarium\Core\Query\AbstractQuery;
+use Solarium\Core\Query\QueryInterface;
 use Solarium\Core\Query\RequestBuilderInterface;
 
 /**
@@ -21,7 +22,7 @@ class RequestBuilder implements RequestBuilderInterface
     /**
      * Build request for a stream query.
      *
-     * @param \Solarium\Core\Query\AbstractQuery $query
+     * @param QueryInterface&Query $query
      *
      * @return Request
      */

src/QueryType/Suggester/RequestBuilder.php

@@ -23,7 +23,7 @@ class RequestBuilder extends BaseRequestBuilder
     /**
      * Build request for a Suggester query.
      *
-     * @param QueryInterface|AbstractQuery|Query $query
+     * @param QueryInterface&Query $query
      *
      * @return Request
      */

src/QueryType/Terms/RequestBuilder.php

@@ -23,7 +23,7 @@ class RequestBuilder extends BaseRequestBuilder
     /**
      * Build request for a Terms query.
      *
-     * @param QueryInterface|AbstractQuery|Query $query
+     * @param QueryInterface&Query $query
      *
      * @return Request
      */

src/QueryType/Update/RequestBuilder/Json.php

@@ -28,7 +28,7 @@ class Json extends AbstractRequestBuilder
     /**
      * Build request for an update query.
      *
-     * @param QueryInterface|AbstractQuery|UpdateQuery $query
+     * @param QueryInterface&UpdateQuery $query
      *
      * @throws RuntimeException
      *

src/QueryType/Update/RequestBuilder/Xml.php

@@ -30,7 +30,7 @@ class Xml extends AbstractRequestBuilder
     /**
      * Build request for an update query.
      *
-     * @param QueryInterface|AbstractQuery|UpdateQuery $query
+     * @param QueryInterface&UpdateQuery $query
      *
      * @return Request
      */

tests/Core/Client/Adapter/CurlTest.php

@@ -88,7 +88,7 @@ public function testExecute()
         $request = new Request();
         $endpoint = new Endpoint();
 
-        /** @var Curl|MockObject $mock */
+        /** @var Curl&MockObject $mock */
         $mock = $this->getMockBuilder(Curl::class)
             ->onlyMethods(['getData'])
             ->getMock();

tests/Core/Client/Adapter/HttpTest.php

@@ -33,7 +33,7 @@ public function testExecute()
         $request->setIsServerRequest(true);
         $endpoint = new Endpoint();
 
-        /** @var Http|MockObject $mock */
+        /** @var Http&MockObject $mock */
         $mock = $this->getMockBuilder(Http::class)
             ->onlyMethods(['getData'])
             ->getMock();
@@ -52,7 +52,7 @@ public function testExecuteErrorResponse()
         $request->setIsServerRequest(true);
         $endpoint = new Endpoint();
 
-        /** @var Http|MockObject $mock */
+        /** @var Http&MockObject $mock */
         $mock = $this->getMockBuilder(Http::class)
             ->onlyMethods(['getData'])
             ->getMock();

tests/Plugin/BufferedAdd/BufferedAddLiteTest.php

@@ -439,7 +439,7 @@ public function testSetUnsupportedRequestFormat()
     /**
      * @param EventDispatcherInterface|null $dispatcher
      *
-     * @return Client|MockObject
+     * @return Client&MockObject
      */
     protected function getClient(?EventDispatcherInterface $dispatcher = null): ClientInterface
     {
@@ -449,7 +449,7 @@ protected function getClient(?EventDispatcherInterface $dispatcher = null): Clie
                 ->method('dispatch');
         }
 
-        /** @var Client|MockObject $client */
+        /** @var Client&MockObject $client */
         $client = $this->createMock(ClientInterface::class);
 
         $client->expects($this->any())