Skip to content

Commit f3d5e7f

Browse files
author
Bizley
authored
Merge pull request #2 from yii-podium/msi-increasing
Increasing MSI for Infection
2 parents fd8c75b + 44895cb commit f3d5e7f

Some content is hidden

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

65 files changed

+984
-175
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Tests
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "master"
48

59
jobs:
610
PHPStan:
@@ -39,7 +43,7 @@ jobs:
3943
- name: PHPStan tests
4044
run: vendor/bin/phpstan analyze -l 8 -a vendor/yiisoft/yii2/Yii.php --no-progress src
4145

42-
PHPUnit:
46+
Infection:
4347
name: PHP ${{ matrix.php }}
4448
runs-on: ubuntu-latest
4549
strategy:
@@ -56,7 +60,7 @@ jobs:
5660
with:
5761
php-version: ${{ matrix.php }}
5862
extensions: mbstring, intl, mysql
59-
coverage: none
63+
coverage: "pcov"
6064
env:
6165
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6266
update: true
@@ -80,5 +84,13 @@ jobs:
8084
if: matrix.php == '7.4'
8185
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
8286

83-
- name: PHPUnit tests
84-
run: vendor/bin/phpunit --verbose
87+
- name: Run PHPUnit
88+
if: matrix.php == '8.0'
89+
run: vendor/bin/phpunit
90+
91+
- name: Run Infection with PHPUnit
92+
if: matrix.php == '7.4'
93+
run: |
94+
mkdir -p build/logs
95+
vendor/bin/phpunit --coverage-xml=build/logs/coverage-xml --log-junit=build/logs/junit.xml
96+
vendor/bin/infection --threads=2 --coverage=build/logs --show-mutations --no-progress

‎README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,4 @@ There are some rules:
1414
- each repository knows how to handle one single storage unit and not more,
1515
- components operate on repositories, not on identifiers.
1616

17-
TODOs:
18-
- [ ] Infection
19-
2017
When API is ready, I'll start preparing the client.

‎infection.json.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"mutators": {
1111
"@default": true
1212
},
13-
"minMsi": 95,
13+
"minMsi": 100,
1414
"minCoveredMsi": 100
1515
}

‎phpunit.xml‎ renamed to ‎phpunit.xml.dist‎

File renamed without changes.

‎src/Services/Category/CategoryArchiver.php‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Podium\Api\Services\Category;
66

7+
use InvalidArgumentException;
78
use Podium\Api\Components\PodiumResponse;
89
use Podium\Api\Events\ArchiveEvent;
910
use Podium\Api\Interfaces\ArchiverInterface;
@@ -38,7 +39,17 @@ private function beforeArchive(): bool
3839
*/
3940
public function archive(RepositoryInterface $category): PodiumResponse
4041
{
41-
if (!$category instanceof CategoryRepositoryInterface || !$this->beforeArchive()) {
42+
if (!$category instanceof CategoryRepositoryInterface) {
43+
return PodiumResponse::error(
44+
[
45+
'exception' => new InvalidArgumentException(
46+
'Category must be instance of Podium\Api\Interfaces\CategoryRepositoryInterface!'
47+
),
48+
]
49+
);
50+
}
51+
52+
if (!$this->beforeArchive()) {
4253
return PodiumResponse::error();
4354
}
4455

@@ -94,7 +105,17 @@ private function beforeRevive(): bool
94105
*/
95106
public function revive(RepositoryInterface $category): PodiumResponse
96107
{
97-
if (!$category instanceof CategoryRepositoryInterface || !$this->beforeRevive()) {
108+
if (!$category instanceof CategoryRepositoryInterface) {
109+
return PodiumResponse::error(
110+
[
111+
'exception' => new InvalidArgumentException(
112+
'Category must be instance of Podium\Api\Interfaces\CategoryRepositoryInterface!'
113+
),
114+
]
115+
);
116+
}
117+
118+
if (!$this->beforeRevive()) {
98119
return PodiumResponse::error();
99120
}
100121

‎src/Services/Category/CategoryRemover.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Podium\Api\Services\Category;
66

7+
use InvalidArgumentException;
78
use Podium\Api\Components\PodiumResponse;
89
use Podium\Api\Events\RemoveEvent;
910
use Podium\Api\Interfaces\CategoryRepositoryInterface;
@@ -36,7 +37,17 @@ private function beforeRemove(): bool
3637
*/
3738
public function remove(RepositoryInterface $category): PodiumResponse
3839
{
39-
if (!$category instanceof CategoryRepositoryInterface || !$this->beforeRemove()) {
40+
if (!$category instanceof CategoryRepositoryInterface) {
41+
return PodiumResponse::error(
42+
[
43+
'exception' => new InvalidArgumentException(
44+
'Category must be instance of Podium\Api\Interfaces\CategoryRepositoryInterface!'
45+
),
46+
]
47+
);
48+
}
49+
50+
if (!$this->beforeRemove()) {
4051
return PodiumResponse::error();
4152
}
4253

‎src/Services/Category/CategorySorter.php‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Podium\Api\Services\Category;
66

7+
use InvalidArgumentException;
78
use Podium\Api\Components\PodiumResponse;
89
use Podium\Api\Events\SortEvent;
910
use Podium\Api\Interfaces\CategoryRepositoryInterface;
@@ -39,11 +40,27 @@ private function beforeReplace(): bool
3940
*/
4041
public function replace(RepositoryInterface $firstCategory, RepositoryInterface $secondCategory): PodiumResponse
4142
{
42-
if (
43-
!$firstCategory instanceof CategoryRepositoryInterface
44-
|| !$secondCategory instanceof CategoryRepositoryInterface
45-
|| !$this->beforeReplace()
46-
) {
43+
if (!$firstCategory instanceof CategoryRepositoryInterface) {
44+
return PodiumResponse::error(
45+
[
46+
'exception' => new InvalidArgumentException(
47+
'First category must be instance of Podium\Api\Interfaces\CategoryRepositoryInterface!'
48+
),
49+
]
50+
);
51+
}
52+
53+
if (!$secondCategory instanceof CategoryRepositoryInterface) {
54+
return PodiumResponse::error(
55+
[
56+
'exception' => new InvalidArgumentException(
57+
'Second category must be instance of Podium\Api\Interfaces\CategoryRepositoryInterface!'
58+
),
59+
]
60+
);
61+
}
62+
63+
if (!$this->beforeReplace()) {
4764
return PodiumResponse::error();
4865
}
4966

@@ -98,7 +115,17 @@ private function beforeSort(): bool
98115
*/
99116
public function sort(RepositoryInterface $category): PodiumResponse
100117
{
101-
if (!$category instanceof CategoryRepositoryInterface || !$this->beforeSort()) {
118+
if (!$category instanceof CategoryRepositoryInterface) {
119+
return PodiumResponse::error(
120+
[
121+
'exception' => new InvalidArgumentException(
122+
'Category must be instance of Podium\Api\Interfaces\CategoryRepositoryInterface!'
123+
),
124+
]
125+
);
126+
}
127+
128+
if (!$this->beforeSort()) {
102129
return PodiumResponse::error();
103130
}
104131

‎src/Services/Forum/ForumArchiver.php‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Podium\Api\Services\Forum;
66

7+
use InvalidArgumentException;
78
use Podium\Api\Components\PodiumResponse;
89
use Podium\Api\Events\ArchiveEvent;
910
use Podium\Api\Interfaces\ArchiverInterface;
@@ -38,7 +39,17 @@ private function beforeArchive(): bool
3839
*/
3940
public function archive(RepositoryInterface $forum): PodiumResponse
4041
{
41-
if (!$forum instanceof ForumRepositoryInterface || !$this->beforeArchive()) {
42+
if (!$forum instanceof ForumRepositoryInterface) {
43+
return PodiumResponse::error(
44+
[
45+
'exception' => new InvalidArgumentException(
46+
'Forum must be instance of Podium\Api\Interfaces\ForumRepositoryInterface!'
47+
),
48+
]
49+
);
50+
}
51+
52+
if (!$this->beforeArchive()) {
4253
return PodiumResponse::error();
4354
}
4455

@@ -94,7 +105,17 @@ private function beforeRevive(): bool
94105
*/
95106
public function revive(RepositoryInterface $forum): PodiumResponse
96107
{
97-
if (!$forum instanceof ForumRepositoryInterface || !$this->beforeRevive()) {
108+
if (!$forum instanceof ForumRepositoryInterface) {
109+
return PodiumResponse::error(
110+
[
111+
'exception' => new InvalidArgumentException(
112+
'Forum must be instance of Podium\Api\Interfaces\ForumRepositoryInterface!'
113+
),
114+
]
115+
);
116+
}
117+
118+
if (!$this->beforeRevive()) {
98119
return PodiumResponse::error();
99120
}
100121

‎src/Services/Forum/ForumBuilder.php‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Podium\Api\Services\Forum;
66

7+
use InvalidArgumentException;
78
use Podium\Api\Components\PodiumResponse;
89
use Podium\Api\Events\BuildEvent;
910
use Podium\Api\Interfaces\CategorisedBuilderInterface;
@@ -44,11 +45,27 @@ public function create(
4445
RepositoryInterface $category,
4546
array $data = []
4647
): PodiumResponse {
47-
if (
48-
!$forum instanceof ForumRepositoryInterface
49-
|| !$category instanceof CategoryRepositoryInterface
50-
|| !$this->beforeCreate()
51-
) {
48+
if (!$forum instanceof ForumRepositoryInterface) {
49+
return PodiumResponse::error(
50+
[
51+
'exception' => new InvalidArgumentException(
52+
'Forum must be instance of Podium\Api\Interfaces\ForumRepositoryInterface!'
53+
),
54+
]
55+
);
56+
}
57+
58+
if (!$category instanceof CategoryRepositoryInterface) {
59+
return PodiumResponse::error(
60+
[
61+
'exception' => new InvalidArgumentException(
62+
'Category must be instance of Podium\Api\Interfaces\CategoryRepositoryInterface!'
63+
),
64+
]
65+
);
66+
}
67+
68+
if (!$this->beforeCreate()) {
5269
return PodiumResponse::error();
5370
}
5471

@@ -100,7 +117,17 @@ private function beforeEdit(): bool
100117
*/
101118
public function edit(RepositoryInterface $forum, array $data = []): PodiumResponse
102119
{
103-
if (!$forum instanceof ForumRepositoryInterface || !$this->beforeEdit()) {
120+
if (!$forum instanceof ForumRepositoryInterface) {
121+
return PodiumResponse::error(
122+
[
123+
'exception' => new InvalidArgumentException(
124+
'Forum must be instance of Podium\Api\Interfaces\ForumRepositoryInterface!'
125+
),
126+
]
127+
);
128+
}
129+
130+
if (!$this->beforeEdit()) {
104131
return PodiumResponse::error();
105132
}
106133

‎src/Services/Forum/ForumMover.php‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Podium\Api\Services\Forum;
66

7+
use InvalidArgumentException;
78
use Podium\Api\Components\PodiumResponse;
89
use Podium\Api\Events\MoveEvent;
910
use Podium\Api\Interfaces\CategoryRepositoryInterface;
@@ -37,11 +38,27 @@ private function beforeMove(): bool
3738
*/
3839
public function move(RepositoryInterface $forum, RepositoryInterface $category): PodiumResponse
3940
{
40-
if (
41-
!$forum instanceof ForumRepositoryInterface
42-
|| !$category instanceof CategoryRepositoryInterface
43-
|| !$this->beforeMove()
44-
) {
41+
if (!$forum instanceof ForumRepositoryInterface) {
42+
return PodiumResponse::error(
43+
[
44+
'exception' => new InvalidArgumentException(
45+
'Forum must be instance of Podium\Api\Interfaces\ForumRepositoryInterface!'
46+
),
47+
]
48+
);
49+
}
50+
51+
if (!$category instanceof CategoryRepositoryInterface) {
52+
return PodiumResponse::error(
53+
[
54+
'exception' => new InvalidArgumentException(
55+
'Category must be instance of Podium\Api\Interfaces\CategoryRepositoryInterface!'
56+
),
57+
]
58+
);
59+
}
60+
61+
if (!$this->beforeMove()) {
4562
return PodiumResponse::error();
4663
}
4764

0 commit comments

Comments
 (0)