Skip to content

Commit 55b8cc1

Browse files
drupoldrupol
authored
Merge pull request #6 from loophp/update-type-declarations-everywhere
Update type declarations in src/
2 parents 9a4b71f + 2a87f46 commit 55b8cc1

35 files changed

+664
-224
lines changed

‎psalm.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
88
>
99
<projectFiles>
10+
<directory name="src"/>
1011
<directory name="tests/static-analysis"/>
1112
<ignoreFiles>
1213
<directory name="vendor" />

‎src/Combinator.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66

77
use Closure;
88
use InvalidArgumentException;
9+
use loophp\combinator\Contract\Combinator as CombinatorInterface;
910

10-
use function get_called_class;
1111
use function is_callable;
1212

1313
/**
1414
* Class Combinator.
15+
*
16+
* @psalm-immutable
1517
*/
16-
abstract class Combinator implements \loophp\combinator\Contract\Combinator
18+
abstract class Combinator implements CombinatorInterface
1719
{
1820
/**
1921
* @return Closure
@@ -26,6 +28,6 @@ public static function with(): Closure
2628
return Closure::fromCallable($possibleCallable);
2729
}
2830

29-
throw new InvalidArgumentException('Implement on() method in ' . get_called_class() . '.');
31+
throw new InvalidArgumentException('Implement on() method in ' . static::class . '.');
3032
}
3133
}

‎src/Combinator/A.php‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,21 @@
1212
*
1313
* @psalm-template AType
1414
* @psalm-template BType
15+
*
16+
* @psalm-immutable
1517
*/
1618
final class A extends Combinator
1719
{
1820
/**
21+
* @psalm-var callable(AType): BType
22+
*
1923
* @var callable
2024
*/
2125
private $f;
2226

2327
/**
28+
* @psalm-var AType
29+
*
2430
* @var mixed
2531
*/
2632
private $x;
@@ -29,7 +35,7 @@ final class A extends Combinator
2935
* A constructor.
3036
*
3137
* @psalm-param callable(AType): BType $f
32-
* @psalm-param BType $x
38+
* @psalm-param AType $x
3339
*
3440
* @param callable $f
3541
* @param mixed $x
@@ -49,16 +55,19 @@ public function __invoke()
4955
}
5056

5157
/**
52-
* @psalm-param callable(AType): BType $f
58+
* @template NewAType
59+
* @template NewBType
5360
*
54-
* @param callable $f
61+
* @param callable(NewAType): NewBType $f
5562
*
56-
* @return Closure
63+
* @return Closure(NewAType): NewBType
5764
*/
5865
public static function on(callable $f): Closure
5966
{
60-
return static function ($x) use ($f) {
61-
return (new self($f, $x))();
62-
};
67+
return
68+
/** @param NewAType $x */
69+
static function ($x) use ($f) {
70+
return (new self($f, $x))();
71+
};
6372
}
6473
}

‎src/Combinator/B.php‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,28 @@
1313
* @psalm-template AType
1414
* @psalm-template BType
1515
* @psalm-template CType
16+
*
17+
* @psalm-immutable
1618
*/
1719
final class B extends Combinator
1820
{
1921
/**
22+
* @psalm-var callable(AType): BType
23+
*
2024
* @var callable
2125
*/
2226
private $f;
2327

2428
/**
29+
* @psalm-var callable(CType): AType
30+
*
2531
* @var callable
2632
*/
2733
private $g;
2834

2935
/**
36+
* @psalm-var CType
37+
*
3038
* @var mixed
3139
*/
3240
private $x;
@@ -58,16 +66,23 @@ public function __invoke()
5866
}
5967

6068
/**
61-
* @param callable $a
69+
* @template AParam
70+
* @template AReturn
71+
*
72+
* @param callable(AParam): AReturn $f
6273
*
63-
* @return Closure
74+
* @return Closure(callable(mixed): AParam): Closure(mixed): AReturn
6475
*/
65-
public static function on(callable $a): Closure
76+
public static function on(callable $f): Closure
6677
{
67-
return static function (callable $b) use ($a): Closure {
68-
return static function ($c) use ($a, $b) {
69-
return (new self($a, $b, $c))();
78+
return
79+
/** @param callable(mixed): AParam $g */
80+
static function (callable $g) use ($f): Closure {
81+
return
82+
/** @param mixed $x */
83+
static function ($x) use ($f, $g) {
84+
return (new self($f, $g, $x))();
85+
};
7086
};
71-
};
7287
}
7388
}

‎src/Combinator/C.php‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,28 @@
1313
* @psalm-template AType
1414
* @psalm-template BType
1515
* @psalm-template CType
16+
*
17+
* @psalm-immutable
1618
*/
1719
final class C extends Combinator
1820
{
1921
/**
22+
* @psalm-var callable(AType): callable(BType): CType
23+
*
2024
* @var callable
2125
*/
2226
private $f;
2327

2428
/**
29+
* @psalm-var BType
30+
*
2531
* @var mixed
2632
*/
2733
private $x;
2834

2935
/**
36+
* @psalm-var AType
37+
*
3038
* @var mixed
3139
*/
3240
private $y;
@@ -51,23 +59,35 @@ public function __construct(callable $f, $x, $y)
5159

5260
/**
5361
* @psalm-return CType
62+
*
63+
* @return mixed
5464
*/
5565
public function __invoke()
5666
{
5767
return ($this->f)($this->y)($this->x);
5868
}
5969

6070
/**
61-
* @param callable $a
71+
* @template NewAType
72+
* @template NewBType
73+
* @template NewCType
74+
*
75+
* @psalm-param callable(NewAType): callable(NewBType): NewCType $f
76+
*
77+
* @param callable(NewAType): NewCType $f
6278
*
63-
* @return Closure
79+
* @return Closure(NewBType): Closure(NewAType): NewCType
6480
*/
65-
public static function on(callable $a): Closure
81+
public static function on(callable $f): Closure
6682
{
67-
return static function ($b) use ($a): Closure {
68-
return static function ($c) use ($a, $b) {
69-
return (new self($a, $b, $c))();
83+
return
84+
/** @param NewBType $x */
85+
static function ($x) use ($f): Closure {
86+
return
87+
/** @param NewAType $y */
88+
static function ($y) use ($f, $x) {
89+
return (new self($f, $x, $y))();
90+
};
7091
};
71-
};
7292
}
7393
}

‎src/Combinator/D.php‎

Lines changed: 52 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,71 +14,94 @@
1414
* @psalm-template BType
1515
* @psalm-template CType
1616
* @psalm-template DType
17+
*
18+
* @psalm-immutable
1719
*/
1820
final class D extends Combinator
1921
{
2022
/**
23+
* @psalm-var callable(AType): callable(CType): DType
24+
*
2125
* @var callable
2226
*/
23-
private $f;
27+
private $a;
2428

2529
/**
26-
* @var callable
30+
* @psalm-var AType
31+
*
32+
* @var mixed
2733
*/
28-
private $g;
34+
private $b;
2935

3036
/**
31-
* @var mixed
37+
* @psalm-var callable(BType): CType
38+
*
39+
* @var callable
3240
*/
33-
private $x;
41+
private $c;
3442

3543
/**
44+
* @psalm-var BType
45+
*
3646
* @var mixed
3747
*/
38-
private $y;
48+
private $d;
3949

4050
/**
4151
* D constructor.
4252
*
43-
* @psalm-param callable(AType): callable(CType): DType $f
44-
* @psalm-param AType $x
45-
* @psalm-param callable(BType): CType $g
46-
* @psalm-param BType $y
53+
* @psalm-param callable(AType): callable(CType): DType $a
54+
* @psalm-param AType $b
55+
* @psalm-param callable(BType): CType $c
56+
* @psalm-param BType $d
4757
*
48-
* @param callable $f
49-
* @param callable $g
50-
* @param mixed $x
51-
* @param mixed $y
58+
* @param callable $a
59+
* @param mixed $b
60+
* @param callable $c
61+
* @param mixed $d
5262
*/
53-
public function __construct(callable $f, $x, callable $g, $y)
63+
public function __construct(callable $a, $b, callable $c, $d)
5464
{
55-
$this->f = $f;
56-
$this->x = $x;
57-
$this->g = $g;
58-
$this->y = $y;
65+
$this->a = $a;
66+
$this->b = $b;
67+
$this->c = $c;
68+
$this->d = $d;
5969
}
6070

6171
/**
6272
* @psalm-return DType
6373
*/
6474
public function __invoke()
6575
{
66-
return (($this->f)($this->x))(($this->g)($this->y));
76+
return (($this->a)($this->b))(($this->c)($this->d));
6777
}
6878

6979
/**
70-
* @param callable $a
80+
* @template NewAType
81+
* @template NewBType
82+
* @template NewCType
83+
* @template NewDType
84+
*
85+
* @psalm-param callable(NewAType): callable(NewCType): NewDType $f
86+
*
87+
* @param callable(NewCType): NewDType $f
7188
*
72-
* @return Closure
89+
* @return Closure(NewAType): Closure(Closure(NewBType): NewCType): Closure(NewBType): NewDType
7390
*/
74-
public static function on(callable $a): Closure
91+
public static function on(callable $f): Closure
7592
{
76-
return static function ($b) use ($a): Closure {
77-
return static function (callable $c) use ($a, $b): Closure {
78-
return static function ($d) use ($a, $b, $c) {
79-
return (new self($a, $b, $c, $d))();
80-
};
93+
return
94+
/** @param NewAType $x */
95+
static function ($x) use ($f): Closure {
96+
return
97+
/** @param callable(NewBType): NewCType $g */
98+
static function (callable $g) use ($f, $x): Closure {
99+
return
100+
/** @param NewBType $y */
101+
static function ($y) use ($f, $x, $g) {
102+
return (new self($f, $x, $g, $y))();
103+
};
104+
};
81105
};
82-
};
83106
}
84107
}

0 commit comments

Comments
 (0)