Skip to content

Commit e0bc241

Browse files
d8vjorkd8vjork
committed
improve tests coverage
1 parent f604c39 commit e0bc241

Some content is hidden

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

46 files changed

+871
-225
lines changed

‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ trim_trailing_whitespace = false
1616

1717
[*.{yml,xml}]
1818
indent_size = 2
19+
20+
[phpunit*.xml]
21+
indent_size = 4

‎composer.json

+81-60
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,83 @@
11
{
2-
"name": "open-southeners/extended-laravel",
3-
"description": "Extended Laravel framework functionalities and out-of-the-box stuff",
4-
"license": "MIT",
5-
"keywords": [
6-
"open-southeners",
7-
"laravel",
8-
"utilities",
9-
"php8",
10-
"php"
11-
],
12-
"authors": [
13-
{
14-
"name": "Ruben Robles",
15-
"email": "[email protected]",
16-
"homepage": "https://d8vjork.com"
2+
"name": "open-southeners/extended-laravel",
3+
"description": "Extended Laravel framework functionalities and out-of-the-box stuff",
4+
"license": "MIT",
5+
"keywords": [
6+
"open-southeners",
7+
"laravel",
8+
"utilities",
9+
"php8",
10+
"php"
11+
],
12+
"authors": [
13+
{
14+
"name": "Ruben Robles",
15+
"email": "[email protected]",
16+
"homepage": "https://d8vjork.com"
17+
}
18+
],
19+
"funding": [
20+
{
21+
"type": "github",
22+
"url": "https://github.com/sponsors/open-southeners"
23+
}
24+
],
25+
"require": {
26+
"php": "^8.1",
27+
"open-southeners/byte-unit-converter": "^3.0",
28+
"open-southeners/extended-php": "^1.0"
29+
},
30+
"require-dev": {
31+
"larastan/larastan": "^2.0",
32+
"laravel/cashier": "^15.0",
33+
"laravel/passport": "^12.0",
34+
"laravel/pint": "^1.5",
35+
"laravel/socialite": "^5.0",
36+
"orchestra/testbench": "^8.0 || ^9.0",
37+
"phpstan/phpstan": "^1.0",
38+
"phpunit/phpunit": "^10.0"
39+
},
40+
"minimum-stability": "stable",
41+
"prefer-stable": true,
42+
"autoload": {
43+
"psr-4": {
44+
"OpenSoutheners\\ExtendedLaravel\\": "src"
45+
}
46+
},
47+
"autoload-dev": {
48+
"psr-4": {
49+
"OpenSoutheners\\ExtendedLaravel\\Tests\\": "tests",
50+
"Workbench\\App\\": "workbench/app/",
51+
"Workbench\\Database\\Factories\\": "workbench/database/factories/",
52+
"Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
53+
}
54+
},
55+
"config": {
56+
"sort-packages": true
57+
},
58+
"extra": {
59+
"laravel": {
60+
"providers": [
61+
"OpenSoutheners\\ExtendedLaravel\\ServiceProvider"
62+
]
63+
}
64+
},
65+
"scripts": {
66+
"post-autoload-dump": [
67+
"@clear",
68+
"@prepare"
69+
],
70+
"clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
71+
"prepare": "@php vendor/bin/testbench package:discover --ansi",
72+
"build": "@php vendor/bin/testbench workbench:build --ansi",
73+
"serve": [
74+
"Composer\\Config::disableProcessTimeout",
75+
"@build",
76+
"@php vendor/bin/testbench serve --ansi"
77+
],
78+
"lint": [
79+
"@php vendor/bin/pint --ansi",
80+
"@php vendor/bin/phpstan analyse --verbose --ansi"
81+
]
1782
}
18-
],
19-
"funding": [
20-
{
21-
"type": "github",
22-
"url": "https://github.com/sponsors/open-southeners"
23-
}
24-
],
25-
"require": {
26-
"php": "^8.1",
27-
"open-southeners/byte-unit-converter": "^3.0",
28-
"open-southeners/extended-php": "^1.0"
29-
},
30-
"require-dev": {
31-
"larastan/larastan": "^2.0",
32-
"laravel/cashier": "^15.0",
33-
"laravel/passport": "^12.0",
34-
"laravel/pint": "^1.5",
35-
"laravel/socialite": "^5.0",
36-
"orchestra/testbench": "^8.0 || ^9.0",
37-
"phpstan/phpstan": "^1.0",
38-
"phpunit/phpunit": "^10.0"
39-
},
40-
"minimum-stability": "stable",
41-
"prefer-stable": true,
42-
"autoload": {
43-
"psr-4": {
44-
"OpenSoutheners\\ExtendedLaravel\\": "src"
45-
}
46-
},
47-
"autoload-dev": {
48-
"psr-4": {
49-
"OpenSoutheners\\ExtendedLaravel\\Tests\\": "tests"
50-
}
51-
},
52-
"config": {
53-
"sort-packages": true
54-
},
55-
"extra": {
56-
"laravel": {
57-
"providers": [
58-
"OpenSoutheners\\ExtendedLaravel\\ServiceProvider"
59-
]
60-
}
61-
}
62-
}
83+
}

‎phpunit.coverage.dist.xml

+70-26
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,73 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
4-
bootstrap="vendor/autoload.php"
5-
backupGlobals="false"
6-
colors="true"
7-
stopOnFailure="false"
8-
cacheDirectory=".phpunit.cache"
9-
backupStaticProperties="false"
10-
>
11-
<coverage>
12-
<include>
13-
<directory suffix=".php">src</directory>
14-
</include>
15-
<report>
16-
<clover outputFile="clover.xml"/>
17-
</report>
18-
</coverage>
19-
<testsuites>
20-
<testsuite name="Package Test Suite">
21-
<directory>tests</directory>
22-
</testsuite>
23-
</testsuites>
24-
<php>
25-
<ini name="memory_limit" value="2048M"/>
26-
<env name="DB_CONNECTION" value="sqlite" force="true"/>
27-
<env name="DB_DATABASE" value=":memory:" force="true"/>
28-
</php>
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
4+
bootstrap="vendor/autoload.php"
5+
cacheDirectory=".phpunit.cache"
6+
executionOrder="depends,defects"
7+
requireCoverageMetadata="false"
8+
beStrictAboutCoverageMetadata="false"
9+
beStrictAboutOutputDuringTests="true"
10+
displayDetailsOnPhpunitDeprecations="true"
11+
failOnPhpunitDeprecation="true"
12+
failOnRisky="true"
13+
failOnWarning="true">
14+
<coverage includeUncoveredFiles="false"
15+
pathCoverage="false"
16+
ignoreDeprecatedCodeUnits="true"
17+
disableCodeCoverageIgnore="false">
18+
<report>
19+
<clover outputFile="clover.xml"/>
20+
</report>
21+
</coverage>
22+
23+
<testsuites>
24+
<testsuite name="Package Test Suite">
25+
<directory>tests</directory>
26+
</testsuite>
27+
</testsuites>
28+
29+
<source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
30+
<include>
31+
<directory>src</directory>
32+
</include>
33+
34+
<exclude>
35+
<file>src/Console/Commands/BuilderMakeCommand.php</file>
36+
<file>src/Console/Commands/CastMakeCommand.php</file>
37+
<file>src/Console/Commands/ChannelMakeCommand.php</file>
38+
<file>src/Console/Commands/ConsoleMakeCommand.php</file>
39+
<file>src/Console/Commands/ControllerMakeCommand.php</file>
40+
<file>src/Console/Commands/EnumMakeCommand.php</file>
41+
<file>src/Console/Commands/EventMakeCommand.php</file>
42+
<file>src/Console/Commands/ExceptionMakeCommand.php</file>
43+
<file>src/Console/Commands/FactoryMakeCommand.php</file>
44+
<file>src/Console/Commands/InterfaceMakeCommand.php</file>
45+
<file>src/Console/Commands/JobMakeCommand.php</file>
46+
<file>src/Console/Commands/ListenerMakeCommand.php</file>
47+
<file>src/Console/Commands/MailMakeCommand.php</file>
48+
<file>src/Console/Commands/MiddlewareMakeCommand.php</file>
49+
<file>src/Console/Commands/MigrateMakeCommand.php</file>
50+
<file>src/Console/Commands/ModelMakeCommand.php</file>
51+
<file>src/Console/Commands/NotificationMakeCommand.php</file>
52+
<file>src/Console/Commands/ObserverMakeCommand.php</file>
53+
<file>src/Console/Commands/PolicyMakeCommand.php</file>
54+
<file>src/Console/Commands/ProviderMakeCommand.php</file>
55+
<file>src/Console/Commands/RequestMakeCommand.php</file>
56+
<file>src/Console/Commands/ResourceMakeCommand.php</file>
57+
<file>src/Console/Commands/RuleMakeCommand.php</file>
58+
<file>src/Console/Commands/ScopeMakeCommand.php</file>
59+
<file>src/Console/Commands/SeederMakeCommand.php</file>
60+
<file>src/Console/Commands/TestMakeCommand.php</file>
61+
<file>src/Console/Commands/TraitMakeCommand.php</file>
62+
<file>src/Console/Commands/ViewMakeCommand.php</file>
63+
<file>src/Console/Commands/FlushHorizonCommand.php</file>
64+
<file>src/AboutCommandIntegration.php</file>
65+
<directory>src/Listeners</directory>
66+
</exclude>
67+
</source>
68+
69+
<php>
70+
<ini name="memory_limit" value="2048M"/>
71+
<env name="DB_CONNECTION" value="testing"/>
72+
</php>
2973
</phpunit>

‎phpunit.dist.xml

+27-18
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
4-
bootstrap="vendor/autoload.php"
5-
backupGlobals="false"
6-
colors="true"
7-
stopOnFailure="false"
8-
cacheDirectory=".phpunit.cache"
9-
backupStaticProperties="false"
10-
>
11-
<testsuites>
12-
<testsuite name="Package Test Suite">
13-
<directory>tests</directory>
14-
</testsuite>
15-
</testsuites>
16-
<php>
17-
<ini name="memory_limit" value="2048M"/>
18-
<env name="DB_CONNECTION" value="sqlite" force="true"/>
19-
<env name="DB_DATABASE" value=":memory:" force="true"/>
20-
</php>
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
4+
bootstrap="vendor/autoload.php"
5+
cacheDirectory=".phpunit.cache"
6+
executionOrder="depends,defects"
7+
requireCoverageMetadata="false"
8+
beStrictAboutCoverageMetadata="false"
9+
beStrictAboutOutputDuringTests="true"
10+
displayDetailsOnPhpunitDeprecations="true"
11+
failOnPhpunitDeprecation="true"
12+
failOnRisky="true"
13+
failOnWarning="true">
14+
<testsuites>
15+
<testsuite name="Package Test Suite">
16+
<directory>tests</directory>
17+
</testsuite>
18+
</testsuites>
19+
20+
<source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
21+
<include>
22+
<directory>src</directory>
23+
</include>
24+
</source>
25+
26+
<php>
27+
<ini name="memory_limit" value="2048M"/>
28+
<env name="DB_CONNECTION" value="testing"/>
29+
</php>
2130
</phpunit>

‎src/Casts/ByteUnit.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ public function get(Model $model, string $key, mixed $value, array $attributes):
2828
*/
2929
public function set(Model $model, string $key, mixed $value, array $attributes): mixed
3030
{
31-
return $value;
31+
return (string) $value;
3232
}
3333
}

‎src/Console/Commands/BatchesQueueCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function handle(): int
3838
->map(function (\stdClass $jobBatch) {
3939
$jobBatch = (array) $jobBatch;
4040

41-
$jobBatch['total_jobs'] = sprintf('%d%%', $jobBatch['pending_jobs'] / $jobBatch['total_jobs'] * 100);
41+
$jobBatch['total_jobs'] = sprintf('%d%%', ($jobBatch['total_jobs']-$jobBatch['pending_jobs']) / $jobBatch['total_jobs'] * 100);
4242

4343
unset($jobBatch['pending_jobs']);
4444

‎src/Console/Commands/ClassMakeCommand.php

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public function handle()
1717
/**
1818
* Resolve the fully-qualified path to the stub.
1919
*
20+
* @codeCoverageIgnore
2021
* @param string $stub
2122
* @return string
2223
*/

‎src/Console/Commands/ClearLocksCacheCommand.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Console\Command;
66
use Illuminate\Console\ConfirmableTrait;
77
use Illuminate\Support\Facades\Cache;
8+
use Illuminate\Support\Facades\DB;
89

910
class ClearLocksCacheCommand extends Command
1011
{
@@ -33,7 +34,11 @@ public function handle(): int
3334
return 1;
3435
}
3536

36-
Cache::lockConnection()->flushDb();
37+
match (config('cache.default')) {
38+
'redis' => Cache::lockConnection()->flushDb(),
39+
'database' => DB::table('cache_locks')->truncate(),
40+
default => null,
41+
};
3742

3843
$this->info('Cache locks cleared successfully!');
3944

0 commit comments

Comments
 (0)