Skip to content

Commit fa34c40

Browse files
thomascorthalsthomascorthals
committed
Drop PHP 8.0 support
1 parent 9f86b09 commit fa34c40

File tree

37 files changed

+89
-92
lines changed

37 files changed

+89
-92
lines changed

‎.github/workflows/run-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
php: [8.0, 8.1, 8.2, 8.3, 8.4]
17+
php: [8.1, 8.2, 8.3, 8.4]
1818
solr: [7, 8, 9]
1919
mode: [cloud, server]
2020

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to the Solarium library will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [Unreleased]
8+
### Removed
9+
- PHP 8.0 support
10+
711
## [6.3.6]
812
### Added
913
- PHP 8.4 support

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Please see the [docs](http://solarium.readthedocs.io/en/stable/) for a more deta
1010

1111
## Requirements
1212

13-
Solarium 6.3.2 and up only supports PHP 8.0 and up.
13+
Solarium 6.3.7 and up only supports PHP 8.1 and up.
1414

1515
It's highly recommended to have cURL enabled in your PHP environment. However if you don't have cURL available you can
1616
switch from using cURL (the default) to a pure PHP based HTTP client adapter which works for the essential stuff but

‎src/Component/Result/Grouping/Result.php

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public function getGroup(string $key)
5555
if (isset($this->groups[$key])) {
5656
return $this->groups[$key];
5757
}
58+
59+
return null;
5860
}
5961

6062
/**

‎src/Core/Query/AbstractRequestBuilder.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ abstract class AbstractRequestBuilder implements RequestBuilderInterface
2626
protected $helper;
2727

2828
/**
29-
* Build request for a select query.
29+
* Build request for a generic query.
3030
*
31-
* @param AbstractQuery|QueryInterface $query
31+
* @param QueryInterface&AbstractQuery $query
3232
*
3333
* @return Request
3434
*/
35-
public function build(AbstractQuery $query): Request
35+
public function build(QueryInterface $query): Request
3636
{
3737
$request = new Request();
3838
$request->setHandler($query->getHandler());

‎src/Core/Query/RequestBuilderInterface.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
interface RequestBuilderInterface
1818
{
1919
/**
20-
* Build request for a select query.
20+
* Build request for a generic query.
2121
*
22-
* @param AbstractQuery $query
22+
* @param QueryInterface&AbstractQuery $query
2323
*
2424
* @return Request
2525
*/
26-
public function build(AbstractQuery $query): Request;
26+
public function build(QueryInterface $query): Request;
2727
}

‎src/QueryType/Analysis/RequestBuilder/Document.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace Solarium\QueryType\Analysis\RequestBuilder;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
1514
use Solarium\Core\Query\QueryInterface;
1615
use Solarium\QueryType\Analysis\Query\Document as QueryDocument;
@@ -23,11 +22,11 @@ class Document extends BaseRequestBuilder
2322
/**
2423
* Build request for an analysis document query.
2524
*
26-
* @param AbstractQuery|QueryInterface|QueryDocument $query
25+
* @param QueryInterface&QueryDocument $query
2726
*
2827
* @return Request
2928
*/
30-
public function build(AbstractQuery $query): Request
29+
public function build(QueryInterface $query): Request
3130
{
3231
$request = parent::build($query);
3332
$request->setRawData($this->getRawData($query));

‎src/QueryType/Analysis/RequestBuilder/Field.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace Solarium\QueryType\Analysis\RequestBuilder;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\QueryInterface;
1514
use Solarium\QueryType\Analysis\Query\Field as QueryField;
1615

@@ -22,11 +21,11 @@ class Field extends RequestBuilder
2221
/**
2322
* Build request for an analysis field query.
2423
*
25-
* @param QueryInterface|QueryField $query
24+
* @param QueryInterface&QueryField $query
2625
*
2726
* @return Request
2827
*/
29-
public function build(AbstractQuery $query): Request
28+
public function build(QueryInterface $query): Request
3029
{
3130
$request = parent::build($query);
3231

‎src/QueryType/Analysis/RequestBuilder/RequestBuilder.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
namespace Solarium\QueryType\Analysis\RequestBuilder;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
1514
use Solarium\Core\Query\QueryInterface;
15+
use Solarium\QueryType\Analysis\Query\AbstractQuery as AbstractAnalysisQuery;
1616

1717
/**
1818
* Build an analysis request.
@@ -22,13 +22,12 @@ class RequestBuilder extends BaseRequestBuilder
2222
/**
2323
* Build request for an analysis query.
2424
*
25-
* @param QueryInterface|AbstractQuery $query
25+
* @param QueryInterface&AbstractAnalysisQuery $query
2626
*
2727
* @return Request
2828
*/
29-
public function build(AbstractQuery $query): Request
29+
public function build(QueryInterface $query): Request
3030
{
31-
/** @var \Solarium\QueryType\Analysis\Query\AbstractQuery $query */
3231
$request = parent::build($query);
3332
$request->addParam('analysis.query', $query->getQuery());
3433
$request->addParam('analysis.showmatch', $query->getShowMatch());

‎src/QueryType/Extract/RequestBuilder.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace Solarium\QueryType\Extract;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
1514
use Solarium\Core\Query\QueryInterface;
1615
use Solarium\Exception\RuntimeException;
@@ -23,13 +22,13 @@ class RequestBuilder extends BaseRequestBuilder
2322
/**
2423
* Build the request.
2524
*
26-
* @param Query|QueryInterface $query
25+
* @param QueryInterface&Query $query
2726
*
2827
* @throws RuntimeException
2928
*
3029
* @return Request
3130
*/
32-
public function build(AbstractQuery $query): Request
31+
public function build(QueryInterface $query): Request
3332
{
3433
$request = parent::build($query);
3534

‎src/QueryType/Luke/RequestBuilder.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace Solarium\QueryType\Luke;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\AbstractRequestBuilder;
1514
use Solarium\Core\Query\QueryInterface;
1615

@@ -22,11 +21,11 @@ class RequestBuilder extends AbstractRequestBuilder
2221
/**
2322
* Build request for a Luke query.
2423
*
25-
* @param QueryInterface|Query $query
24+
* @param QueryInterface&Query $query
2625
*
2726
* @return Request
2827
*/
29-
public function build(AbstractQuery $query): Request
28+
public function build(QueryInterface $query): Request
3029
{
3130
$request = parent::build($query);
3231

‎src/QueryType/ManagedResources/RequestBuilder/Resource.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
namespace Solarium\QueryType\ManagedResources\RequestBuilder;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\AbstractRequestBuilder;
14+
use Solarium\Core\Query\QueryInterface;
1515
use Solarium\Exception\RuntimeException;
1616
use Solarium\QueryType\ManagedResources\Query\AbstractCommand;
1717
use Solarium\QueryType\ManagedResources\Query\AbstractQuery as BaseQuery;
@@ -24,13 +24,13 @@ class Resource extends AbstractRequestBuilder
2424
/**
2525
* Build request for a resource query.
2626
*
27-
* @param \Solarium\Core\Query\AbstractQuery $query
27+
* @param QueryInterface&BaseQuery $query
2828
*
29-
* @throws \Solarium\Exception\RuntimeException
29+
* @throws RuntimeException
3030
*
31-
* @return \Solarium\Core\Client\Request
31+
* @return Request
3232
*/
33-
public function build(AbstractQuery $query): Request
33+
public function build(QueryInterface $query): Request
3434
{
3535
if (empty($query->getName())) {
3636
throw new RuntimeException('Name of the resource is not set in the query.');
@@ -56,10 +56,10 @@ public function build(AbstractQuery $query): Request
5656
}
5757

5858
/**
59-
* @param \Solarium\Core\Client\Request $request
60-
* @param \Solarium\QueryType\ManagedResources\Query\AbstractCommand $command
59+
* @param Request $request
60+
* @param AbstractCommand $command
6161
*
62-
* @throws \Solarium\Exception\RuntimeException
62+
* @throws RuntimeException
6363
*
6464
* @return self Provides fluent interface
6565
*/

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Solarium\Core\Query\AbstractQuery;
1414
use Solarium\Core\Query\Result\QueryType as BaseResult;
1515
use Solarium\Core\Query\Result\Result;
16+
use Solarium\QueryType\ManagedResources\Result\Resources\Resource as ManagedResource;
1617

1718
/**
1819
* ResourceList.
@@ -29,15 +30,15 @@ class ResourceList extends BaseResult implements \IteratorAggregate, \Countable
2930
/**
3031
* List items.
3132
*
32-
* @var \Solarium\QueryType\ManagedResources\Result\Resources\Resource[]
33+
* @var ManagedResource[]
3334
*/
3435
protected $items = [];
3536

3637
/**
3738
* Constructor.
3839
*
39-
* @param \Solarium\Core\Query\AbstractQuery $query
40-
* @param \Solarium\Core\Client\Response $response
40+
* @param AbstractQuery $query
41+
* @param Response $response
4142
*/
4243
public function __construct(AbstractQuery $query, Response $response)
4344
{
@@ -57,7 +58,7 @@ public function getName(): string
5758
/**
5859
* Get all items.
5960
*
60-
* @return \Solarium\QueryType\ManagedResources\Result\Resources\Resource[]
61+
* @return ManagedResource[]
6162
*/
6263
public function getItems(): array
6364
{

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class WordSet extends BaseResult implements \IteratorAggregate, \Countable
6767
/**
6868
* Constructor.
6969
*
70-
* @param \Solarium\Core\Query\AbstractQuery $query
71-
* @param \Solarium\Core\Client\Response $response
70+
* @param AbstractQuery $query
71+
* @param Response $response
7272
*/
7373
public function __construct(AbstractQuery $query, Response $response)
7474
{

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ class SynonymMappings extends BaseResult implements \IteratorAggregate, \Countab
7474
/**
7575
* Constructor.
7676
*
77-
* @param \Solarium\Core\Query\AbstractQuery $query
78-
* @param \Solarium\Core\Client\Response $response
77+
* @param AbstractQuery $query
78+
* @param Response $response
7979
*/
8080
public function __construct(AbstractQuery $query, Response $response)
8181
{

‎src/QueryType/MoreLikeThis/RequestBuilder.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace Solarium\QueryType\MoreLikeThis;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\QueryInterface;
1514
use Solarium\QueryType\Select\RequestBuilder as SelectRequestBuilder;
1615

@@ -22,11 +21,11 @@ class RequestBuilder extends SelectRequestBuilder
2221
/**
2322
* Build request for a MoreLikeThis query.
2423
*
25-
* @param QueryInterface|Query $query
24+
* @param QueryInterface&Query $query
2625
*
2726
* @return Request
2827
*/
29-
public function build(AbstractQuery $query): Request
28+
public function build(QueryInterface $query): Request
3029
{
3130
$request = parent::build($query);
3231

‎src/QueryType/Ping/RequestBuilder.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace Solarium\QueryType\Ping;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
1514
use Solarium\Core\Query\QueryInterface;
1615

@@ -22,11 +21,11 @@ class RequestBuilder extends BaseRequestBuilder
2221
/**
2322
* Build request for a ping query.
2423
*
25-
* @param QueryInterface|Query $query
24+
* @param QueryInterface&Query $query
2625
*
2726
* @return Request
2827
*/
29-
public function build(AbstractQuery $query): Request
28+
public function build(QueryInterface $query): Request
3029
{
3130
$request = parent::build($query);
3231
$request->setMethod(Request::METHOD_GET);

‎src/QueryType/RealtimeGet/RequestBuilder.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace Solarium\QueryType\RealtimeGet;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
1514
use Solarium\Core\Query\QueryInterface;
1615

@@ -22,11 +21,11 @@ class RequestBuilder extends BaseRequestBuilder
2221
/**
2322
* Build request for a ping query.
2423
*
25-
* @param QueryInterface|Query $query
24+
* @param QueryInterface&Query $query
2625
*
2726
* @return Request
2827
*/
29-
public function build(AbstractQuery $query): Request
28+
public function build(QueryInterface $query): Request
3029
{
3130
$request = parent::build($query);
3231
$request->setMethod(Request::METHOD_GET);

‎src/QueryType/Select/RequestBuilder.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace Solarium\QueryType\Select;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
1514
use Solarium\Core\Query\QueryInterface;
1615
use Solarium\QueryType\Select\Query\Query as SelectQuery;
@@ -27,7 +26,7 @@ class RequestBuilder extends BaseRequestBuilder
2726
*
2827
* @return Request
2928
*/
30-
public function build(AbstractQuery $query): Request
29+
public function build(QueryInterface $query): Request
3130
{
3231
$request = parent::build($query);
3332

‎src/QueryType/Server/Api/RequestBuilder.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace Solarium\QueryType\Server\Api;
1111

1212
use Solarium\Core\Client\Request;
13-
use Solarium\Core\Query\AbstractQuery;
1413
use Solarium\Core\Query\AbstractRequestBuilder as BaseRequestBuilder;
1514
use Solarium\Core\Query\QueryInterface;
1615
use Solarium\QueryType\Server\Api\Query as ApiQuery;
@@ -23,11 +22,11 @@ class RequestBuilder extends BaseRequestBuilder
2322
/**
2423
* Build request for a API query.
2524
*
26-
* @param QueryInterface|ApiQuery $query
25+
* @param QueryInterface&ApiQuery $query
2726
*
2827
* @return Request
2928
*/
30-
public function build(AbstractQuery $query): Request
29+
public function build(QueryInterface $query): Request
3130
{
3231
$request = parent::build($query);
3332

0 commit comments

Comments
 (0)