Skip to content

Commit d9945e0

Browse files
author
MateuszKolankowski
committed
Allowed nullable type declarations for method parameters across the codebase
1 parent 99a8fb5 commit d9945e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+50
-217
lines changed

phpstan-baseline.neon

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -588,18 +588,6 @@ parameters:
588588
count: 1
589589
path: src/lib/Gateway/EndpointResolver/NativeEndpointResolver.php
590590

591-
-
592-
message: '#^Method Ibexa\\Solr\\Gateway\\HttpClient\\Stream\:\:getResponseMessage\(\) has parameter \$method with no type specified\.$#'
593-
identifier: missingType.parameter
594-
count: 1
595-
path: src/lib/Gateway/HttpClient/Stream.php
596-
597-
-
598-
message: '#^Method Ibexa\\Solr\\Gateway\\HttpClient\\Stream\:\:getResponseMessage\(\) has parameter \$path with no type specified\.$#'
599-
identifier: missingType.parameter
600-
count: 1
601-
path: src/lib/Gateway/HttpClient/Stream.php
602-
603591
-
604592
message: '#^Method Ibexa\\Solr\\Gateway\\Message\:\:__construct\(\) has parameter \$headers with no value type specified in iterable type array\.$#'
605593
identifier: missingType.iterableValue

src/lib/Gateway/HttpClient.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,7 @@
1111
*/
1212
interface HttpClient
1313
{
14-
/**
15-
* @param string $method
16-
* @param \Ibexa\Solr\Gateway\Endpoint $endpoint
17-
* @param string $path
18-
*
19-
* @return \Ibexa\Solr\Gateway\Message
20-
*/
21-
public function request($method, Endpoint $endpoint, $path, ?Message $message = null);
14+
public function request(string $method, Endpoint $endpoint, string $path, ?Message $message = null): Message;
2215
}
2316

2417
class_alias(HttpClient::class, 'EzSystems\EzPlatformSolrSearchEngine\Gateway\HttpClient');

src/lib/Gateway/HttpClient/Stream.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ public function __construct(HttpClientInterface $client, int $timeout = 10)
4040
$this->setLogger(new NullLogger());
4141
}
4242

43-
/**
44-
* @param string $method
45-
* @param string $path
46-
*/
47-
public function request($method, Endpoint $endpoint, $path, ?Message $message = null): Message
43+
public function request(string $method, Endpoint $endpoint, string $path, ?Message $message = null): Message
4844
{
4945
$message = $message ?? new Message();
5046

@@ -67,9 +63,9 @@ public function request($method, Endpoint $endpoint, $path, ?Message $message =
6763
* @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
6864
*/
6965
private function getResponseMessage(
70-
$method,
66+
string $method,
7167
Endpoint $endpoint,
72-
$path,
68+
string $path,
7369
Message $message
7470
): Message {
7571
if ($endpoint->user !== null) {

src/lib/Query/Common/CriterionVisitor/Aggregate.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,9 @@ public function canVisit(Criterion $criterion)
5353
}
5454

5555
/**
56-
* Map field value to a proper Solr representation.
57-
*
5856
* @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException
59-
*
60-
* @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor
61-
*
62-
* @return string
6357
*/
64-
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null)
58+
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
6559
{
6660
foreach ($this->visitors as $visitor) {
6761
if ($visitor->canVisit($criterion)) {

src/lib/Query/Common/CriterionVisitor/ContentIdIn.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ public function canVisit(Criterion $criterion)
3030
);
3131
}
3232

33-
/**
34-
* @return string
35-
*/
36-
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null)
33+
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
3734
{
3835
return '(' .
3936
implode(

src/lib/Query/Common/CriterionVisitor/ContentTypeGroupIdIn.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ public function canVisit(Criterion $criterion)
3030
);
3131
}
3232

33-
/**
34-
* @return string
35-
*/
36-
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null)
33+
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
3734
{
3835
return '(' .
3936
implode(

src/lib/Query/Common/CriterionVisitor/ContentTypeIdIn.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ public function canVisit(Criterion $criterion)
3030
);
3131
}
3232

33-
/**
34-
* @return string
35-
*/
36-
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null)
33+
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
3734
{
3835
return '(' .
3936
implode(

src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,9 @@ public function canVisit(Criterion $criterion)
5656
}
5757

5858
/**
59-
* Map field value to a proper Solr representation.
60-
*
6159
* @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor
62-
*
63-
* @return string
6460
*/
65-
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null)
61+
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
6662
{
6763
$validIds = [];
6864
$invalidIdentifiers = [];

src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldIn.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ public function canVisit(Criterion $criterion)
3131
);
3232
}
3333

34-
/**
35-
* @return string
36-
*/
37-
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null)
34+
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
3835
{
3936
$queries = [];
4037
$values = (array)$criterion->value;

src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldRange.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ public function canVisit(Criterion $criterion)
3333
);
3434
}
3535

36-
/**
37-
* @return string
38-
*/
39-
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null)
36+
public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
4037
{
4138
$values = (array)$criterion->value;
4239
$start = $values[0];

0 commit comments

Comments
 (0)