Skip to content

Commit 78ecca1

Browse files
authored
Merge pull request #66 from Art4/phpstan-level-6
Fix all errors for PHPStan Level 6
2 parents afe7cf8 + fe13482 commit 78ecca1

21 files changed

+45
-38
lines changed

.github/workflows/phpstan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ jobs:
4949
run: composer install --no-progress --prefer-dist --optimize-autoloader
5050

5151
- name: Run PHPStan
52-
run: vendor/bin/phpstan.phar analyze src --level 5
52+
run: vendor/bin/phpstan.phar analyze src --level 6
5353

5454
- run: echo "🍏 This job's status is ${{ job.status }}."

src/Accessable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function has($key);
4545
/**
4646
* Returns the keys of all setted values
4747
*
48-
* @return array Keys of all setted values
48+
* @return array<string> Keys of all setted values
4949
*/
5050
public function getKeys();
5151
}

src/Factory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ interface Factory
3030
* Create a new instance of a class
3131
*
3232
* @param string $name
33-
* @param array $args
33+
* @param array<mixed|Manager|Accessable> $args
3434
*
3535
* @return \Art4\JsonApiClient\Accessable
3636
*/

src/Helper/AbstractElement.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ protected function create($name, $data)
9797
* Parse the data
9898
*
9999
* @param mixed $data
100+
*
101+
* @return void
100102
*/
101103
abstract protected function parse($data);
102104
}

src/Helper/AccessKey.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ final class AccessKey extends SplStack
3333
*
3434
* @param mixed $key
3535
*
36-
* @return AccessKey
36+
* @return AccessKey<string>
3737
*/
3838
public static function create($key)
3939
{

src/Helper/AccessableTrait.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
trait AccessableTrait
3131
{
3232
/**
33-
* @var array
33+
* @var array<mixed>
3434
*/
3535
private $data = [];
3636

@@ -57,7 +57,7 @@ protected function set($key, $value)
5757
/**
5858
* Returns the keys of all setted values
5959
*
60-
* @return array Keys of all setted values
60+
* @return array<string> Keys of all setted values
6161
*/
6262
public function getKeys()
6363
{
@@ -144,9 +144,9 @@ private function getValue($key)
144144
/**
145145
* Parse a dot.notated.key to an object
146146
*
147-
* @param string|AccessKey $key The key
147+
* @param string|AccessKey<string> $key The key
148148
*
149-
* @return AccessKey The parsed key
149+
* @return AccessKey<string> The parsed key
150150
*/
151151
private function parseKey($key)
152152
{

src/Input/RequestStringInput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ final class RequestStringInput implements Input, RequestInput
2626
{
2727
use StringInputTrait;
2828

29-
private $rawString;
29+
private string $rawString;
3030

3131
/**
3232
* Set the input

src/Input/ResponseStringInput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ final class ResponseStringInput implements Input
2626
{
2727
use StringInputTrait;
2828

29-
private $rawString;
29+
private string $rawString;
3030

3131
/**
3232
* Set the input

src/Manager/ErrorAbortManager.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@
3131
*/
3232
final class ErrorAbortManager implements Manager
3333
{
34-
private $factory;
34+
private Factory $factory;
3535

36-
private $config = [];
36+
/** @var array<string, mixed> */
37+
private array $config = [];
3738

38-
private $default = [
39+
/** @var array<string, mixed> */
40+
private array $default = [
3941
'optional_item_id' => false,
4042
];
4143

src/Serializer/ArraySerializer.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@
2424

2525
final class ArraySerializer implements Serializer
2626
{
27-
private $config = [
27+
/** @var array<string, mixed> */
28+
private array $config = [
2829
'recursive' => false,
2930
];
3031

3132
/**
3233
* Setup the serializer
3334
*
34-
* @param array $params
35+
* @param array<string, mixed> $params
3536
*/
3637
public function __construct(array $params = [])
3738
{
@@ -47,7 +48,7 @@ public function __construct(array $params = [])
4748
*
4849
* @param \Art4\JsonApiClient\Accessable $data The data for serialization
4950
*
50-
* @return array|null
51+
* @return array<string, mixed>|null
5152
*/
5253
public function serialize(Accessable $data)
5354
{

0 commit comments

Comments
 (0)