Skip to content

Commit f9cb3e4

Browse files
drupoldrupol
authored
Merge pull request #8 from loophp/fix-static-analysis-tools-warnings
Fix static analysis tools warnings
2 parents 7ac3e17 + 37d1bea commit f9cb3e4

38 files changed

+477
-772
lines changed

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
github: loophp
1+
github: drupol
2+
custom: ["https://www.paypal.me/drupol"]

‎.github/workflows/continuous-integration.yml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
3434

3535
- name: Cache dependencies
36-
uses: actions/cache@v1
36+
uses: actions/cache@v2
3737
with:
3838
path: ${{ steps.composer-cache.outputs.dir }}
3939
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -43,14 +43,28 @@ jobs:
4343
run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
4444

4545
- name: Run Grumphp
46-
run: vendor/bin/grumphp run
46+
run: vendor/bin/grumphp run --no-ansi -n
4747
env:
4848
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
4949

5050
- name: Send PSALM data
5151
run: vendor/bin/psalm --shepherd --stats
5252
continue-on-error: true
5353

54-
- name: Scrutinizer
55-
run: vendor/bin/ocular code-coverage:upload --format=php-clover build/logs/clover.xml
54+
- name: Send Scrutinizer data
55+
run: |
56+
wget https://scrutinizer-ci.com/ocular.phar
57+
php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
58+
continue-on-error: true
59+
60+
- name: Infection score report
61+
run: |
62+
vendor/bin/infection run -j 2
63+
continue-on-error: true
64+
65+
- name: PHP Insights report
66+
run: |
67+
rm -rf composer.lock vendor
68+
composer require nunomaduro/phpinsights --dev
69+
vendor/bin/phpinsights analyse src/ -n
5670
continue-on-error: true

‎composer.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818
"php": ">= 7.1.3"
1919
},
2020
"require-dev": {
21-
"drupol/php-conventions": "^1.6.14",
21+
"drupol/php-conventions": "^1.7.1",
2222
"friends-of-phpspec/phpspec-code-coverage": "^4.3.2",
2323
"infection/infection": "^0.13.6",
24-
"phpspec/phpspec": "^5.1.2 || ^6.1.1",
25-
"phpstan/phpstan": "^0.12.8",
24+
"phpspec/phpspec": "^5.1.2 || ^6.2.1",
25+
"phpstan/phpstan": "^0.12.32",
2626
"phpstan/phpstan-strict-rules": "^0.12",
27-
"scrutinizer/ocular": "^1.6",
28-
"vimeo/psalm": "^3.8.3"
27+
"vimeo/psalm": "^3.12.2"
2928
},
3029
"config": {
3130
"sort-packages": true

‎src/Combinator.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212

1313
/**
1414
* Class Combinator.
15-
*
16-
* @psalm-immutable
1715
*/
1816
abstract class Combinator implements CombinatorInterface
1917
{
2018
/**
21-
* @return Closure
19+
* @psalm-pure
2220
*/
2321
public static function with(): Closure
2422
{

‎src/Combinator/A.php‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,26 @@
1010
/**
1111
* Class A.
1212
*
13-
* @psalm-template AType
14-
* @psalm-template BType
15-
*
16-
* @psalm-immutable
13+
* @template AType
14+
* @template BType
1715
*/
1816
final class A extends Combinator
1917
{
2018
/**
21-
* @psalm-var callable(AType): BType
22-
*
23-
* @var callable
19+
* @var callable(AType): BType
2420
*/
2521
private $f;
2622

2723
/**
28-
* @psalm-var AType
29-
*
30-
* @var mixed
24+
* @var AType
3125
*/
3226
private $x;
3327

3428
/**
3529
* A constructor.
3630
*
37-
* @psalm-param callable(AType): BType $f
38-
* @psalm-param AType $x
39-
*
40-
* @param callable $f
41-
* @param mixed $x
31+
* @param callable(AType): BType $f
32+
* @param AType $x
4233
*/
4334
public function __construct(callable $f, $x)
4435
{
@@ -47,7 +38,7 @@ public function __construct(callable $f, $x)
4738
}
4839

4940
/**
50-
* @psalm-return BType
41+
* @return BType
5142
*/
5243
public function __invoke()
5344
{

‎src/Combinator/B.php‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,33 @@
1010
/**
1111
* Class B.
1212
*
13-
* @psalm-template AType
14-
* @psalm-template BType
15-
* @psalm-template CType
16-
*
17-
* @psalm-immutable
13+
* @template AType
14+
* @template BType
15+
* @template CType
1816
*/
1917
final class B extends Combinator
2018
{
2119
/**
22-
* @psalm-var callable(AType): BType
23-
*
24-
* @var callable
20+
* @var callable(AType): BType
2521
*/
2622
private $f;
2723

2824
/**
29-
* @psalm-var callable(CType): AType
30-
*
31-
* @var callable
25+
* @var callable(CType): AType
3226
*/
3327
private $g;
3428

3529
/**
36-
* @psalm-var CType
37-
*
38-
* @var mixed
30+
* @var CType
3931
*/
4032
private $x;
4133

4234
/**
4335
* B constructor.
4436
*
45-
* @psalm-param callable(AType): BType $f
46-
* @psalm-param callable(CType): AType $g
47-
* @psalm-param CType $x
48-
*
49-
* @param callable $f
50-
* @param callable $g
51-
* @param mixed $x
37+
* @param callable(AType): BType $f
38+
* @param callable(CType): AType $g
39+
* @param CType $x
5240
*/
5341
public function __construct(callable $f, callable $g, $x)
5442
{
@@ -58,28 +46,37 @@ public function __construct(callable $f, callable $g, $x)
5846
}
5947

6048
/**
61-
* @psalm-return BType
49+
* @return BType
6250
*/
6351
public function __invoke()
6452
{
6553
return ($this->f)(($this->g)($this->x));
6654
}
6755

6856
/**
69-
* @template AParam
70-
* @template AReturn
57+
* @template NewAType
58+
* @template NewBType
59+
* @template NewCType
7160
*
72-
* @param callable(AParam): AReturn $f
61+
* @param callable(NewAType): (NewBType) $f
7362
*
74-
* @return Closure(callable(mixed): AParam): Closure(mixed): AReturn
63+
* @return Closure(Closure(NewCType):(NewAType)):(Closure(NewCType):(NewBType))
7564
*/
7665
public static function on(callable $f): Closure
7766
{
7867
return
79-
/** @param callable(mixed): AParam $g */
68+
/**
69+
* @param callable(NewCType):(NewAType) $g
70+
*
71+
* @return Closure(NewCType):(NewBType)
72+
*/
8073
static function (callable $g) use ($f): Closure {
8174
return
82-
/** @param mixed $x */
75+
/**
76+
* @param NewCType $x
77+
*
78+
* @return NewBType
79+
*/
8380
static function ($x) use ($f, $g) {
8481
return (new self($f, $g, $x))();
8582
};

‎src/Combinator/C.php‎

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,33 @@
1010
/**
1111
* Class C.
1212
*
13-
* @psalm-template AType
14-
* @psalm-template BType
15-
* @psalm-template CType
16-
*
17-
* @psalm-immutable
13+
* @template AType
14+
* @template BType
15+
* @template CType
1816
*/
1917
final class C extends Combinator
2018
{
2119
/**
22-
* @psalm-var callable(AType): callable(BType): CType
23-
*
24-
* @var callable
20+
* @var callable(AType): callable(BType): CType
2521
*/
2622
private $f;
2723

2824
/**
29-
* @psalm-var BType
30-
*
31-
* @var mixed
25+
* @var BType
3226
*/
3327
private $x;
3428

3529
/**
36-
* @psalm-var AType
37-
*
38-
* @var mixed
30+
* @var AType
3931
*/
4032
private $y;
4133

4234
/**
4335
* C constructor.
4436
*
45-
* @psalm-param callable(AType): callable(BType): CType $f
46-
* @psalm-param BType $x
47-
* @psalm-param AType $y
48-
*
49-
* @param callable $f
50-
* @param mixed $x
51-
* @param mixed $y
37+
* @param callable(AType): (callable(BType): (CType)) $f
38+
* @param BType $x
39+
* @param AType $y
5240
*/
5341
public function __construct(callable $f, $x, $y)
5442
{
@@ -58,9 +46,7 @@ public function __construct(callable $f, $x, $y)
5846
}
5947

6048
/**
61-
* @psalm-return CType
62-
*
63-
* @return mixed
49+
* @return CType
6450
*/
6551
public function __invoke()
6652
{
@@ -72,19 +58,25 @@ public function __invoke()
7258
* @template NewBType
7359
* @template NewCType
7460
*
75-
* @psalm-param callable(NewAType): callable(NewBType): NewCType $f
76-
*
77-
* @param callable(NewAType): NewCType $f
61+
* @param callable(NewAType): (callable(NewBType): (NewCType)) $f
7862
*
79-
* @return Closure(NewBType): Closure(NewAType): NewCType
63+
* @return Closure(NewBType):(Closure(NewAType):(NewCType))
8064
*/
8165
public static function on(callable $f): Closure
8266
{
8367
return
84-
/** @param NewBType $x */
68+
/**
69+
* @param NewBType $x
70+
*
71+
* @return Closure(NewAType):(NewCType)
72+
*/
8573
static function ($x) use ($f): Closure {
8674
return
87-
/** @param NewAType $y */
75+
/**
76+
* @param NewAType $y
77+
*
78+
* @return NewCType
79+
*/
8880
static function ($y) use ($f, $x) {
8981
return (new self($f, $x, $y))();
9082
};

0 commit comments

Comments
 (0)