Skip to content

Commit 125e7f6

Browse files
author
cradu
committed
Added rector rules
1 parent 7876319 commit 125e7f6

29 files changed

+91
-144
lines changed

‎rector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
__DIR__.'/tests',
1212
])
1313
// uncomment to reach your current PHP version
14-
// ->withPhpSets()
14+
->withPhpSets()
1515
->withRules([
1616
AddVoidReturnTypeWhereNoReturnRector::class,
1717
]);

‎src/Console/Commands/Hooks/BladeFormatterPreCommitHook.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function fixerCommand(): string
5555
*/
5656
public function configParam(): string
5757
{
58-
$bladeFormatterConfig = rtrim(config('git-hooks.code_analyzers.blade_formatter.config'), '/');
58+
$bladeFormatterConfig = rtrim((string) config('git-hooks.code_analyzers.blade_formatter.config'), '/');
5959
$this->validateConfigPath($bladeFormatterConfig);
6060

6161
return empty($bladeFormatterConfig) ? '' : '--config='.$bladeFormatterConfig;

‎src/Console/Commands/Hooks/ESLintPreCommitHook.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function fixerCommand(): string
6262
*/
6363
protected function configParam(): string
6464
{
65-
$eslintConfig = rtrim(config('git-hooks.code_analyzers.eslint.config'), '/');
65+
$eslintConfig = rtrim((string) config('git-hooks.code_analyzers.eslint.config'), '/');
6666
$this->validateConfigPath($eslintConfig);
6767

6868
return empty($eslintConfig) ? '' : '--config='.$eslintConfig;
@@ -77,8 +77,8 @@ protected function additionalParams(): ?string
7777
$additionalParams = config('git-hooks.code_analyzers.eslint.additional_params');
7878

7979
if (! empty($additionalParams)) {
80-
$additionalParams = preg_replace('/\s+\.(?:(\s)|$)/', '$1', $additionalParams);
81-
$additionalParams = preg_replace('/\s*--(config|c)\b(=\S*)?\s*/', '', $additionalParams);
80+
$additionalParams = preg_replace('/\s+\.(?:(\s)|$)/', '$1', (string) $additionalParams);
81+
$additionalParams = preg_replace('/\s*--(config|c)\b(=\S*)?\s*/', '', (string) $additionalParams);
8282
}
8383

8484
return $additionalParams;

‎src/Console/Commands/Hooks/LarastanPreCommitHook.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function analyzerCommand(): string
4444
if (! empty($additionalParams)) {
4545
// Removing configuration/c/xdebug parameters from additional parameters to avoid conflicts
4646
// because they are already set in the command by default.
47-
$additionalParams = preg_replace('/\s*--(configuration|c|xdebug)\b(=\S*)?\s*/', '', $additionalParams);
47+
$additionalParams = preg_replace('/\s*--(configuration|c|xdebug)\b(=\S*)?\s*/', '', (string) $additionalParams);
4848
}
4949

5050
return trim(
@@ -67,7 +67,7 @@ public function fixerCommand(): string
6767
*/
6868
protected function configParam(): string
6969
{
70-
$phpStanConfigFile = rtrim(config('git-hooks.code_analyzers.larastan.config'), '/');
70+
$phpStanConfigFile = rtrim((string) config('git-hooks.code_analyzers.larastan.config'), '/');
7171
$this->validateConfigPath($phpStanConfigFile);
7272

7373
return empty($phpStanConfigFile) ? '' : '--configuration='.$phpStanConfigFile;

‎src/Console/Commands/Hooks/PHPCodeSnifferPreCommitHook.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function fixerCommand(): string
5959
*/
6060
public function configParam(): string
6161
{
62-
$phpCSStandard = rtrim(config('git-hooks.code_analyzers.php_code_sniffer.config'), '/');
62+
$phpCSStandard = rtrim((string) config('git-hooks.code_analyzers.php_code_sniffer.config'), '/');
6363
$this->validateConfigPath($phpCSStandard);
6464

6565
return empty($phpCSStandard) ? '' : '--standard='.$phpCSStandard;

‎src/Console/Commands/Hooks/PintPreCommitHook.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ protected function configParam(): string
6161
if (! empty($pintConfigFile)) {
6262
$this->validateConfigPath($pintConfigFile);
6363

64-
return '--config '.trim($pintConfigFile, '/');
64+
return '--config '.trim((string) $pintConfigFile, '/');
6565
}
6666

6767
$pintPreset = config('git-hooks.code_analyzers.laravel_pint.preset');
6868

69-
return empty($pintPreset) ? '' : '--preset '.trim($pintPreset, '/');
69+
return empty($pintPreset) ? '' : '--preset '.trim((string) $pintPreset, '/');
7070
}
7171
}

‎src/Console/Commands/Hooks/PrettierPreCommitHook.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function fixerCommand(): string
6060
*/
6161
protected function configParam(): string
6262
{
63-
$prettierConfig = rtrim(config('git-hooks.code_analyzers.prettier.config'), '/');
63+
$prettierConfig = rtrim((string) config('git-hooks.code_analyzers.prettier.config'), '/');
6464
$this->validateConfigPath($prettierConfig);
6565

6666
return empty($prettierConfig) ? '' : '--config='.$prettierConfig;
@@ -75,8 +75,8 @@ protected function additionalParams(): ?string
7575
$additionalParams = config('git-hooks.code_analyzers.prettier.additional_params');
7676

7777
if (! empty($additionalParams)) {
78-
$additionalParams = preg_replace('/\s+\.(?:(\s)|$)/', '$1', $additionalParams);
79-
$additionalParams = preg_replace('/\s*--(config|find-config-path|write|check)\b(=\S*)?\s*/', '', $additionalParams);
78+
$additionalParams = preg_replace('/\s+\.(?:(\s)|$)/', '$1', (string) $additionalParams);
79+
$additionalParams = preg_replace('/\s*--(config|find-config-path|write|check)\b(=\S*)?\s*/', '', (string) $additionalParams);
8080
}
8181

8282
return $additionalParams;

‎src/Console/Commands/PreCommit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function handle()
5757
$this->clearPipelineFailed();
5858
throw new HookFailException();
5959
}
60-
} catch (HookFailException $e) {
60+
} catch (HookFailException) {
6161
return 1;
6262
}
6363
}

‎src/Git/ChangedFile.php‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
namespace Igorsgm\GitHooks\Git;
44

5-
class ChangedFile
5+
class ChangedFile implements \Stringable
66
{
7-
const A = 1; // added
7+
public const A = 1; // added
88

9-
const M = 2; // modified
9+
public const M = 2; // modified
1010

11-
const D = 4; // deleted
11+
public const D = 4; // deleted
1212

13-
const R = 8; // renamed
13+
public const R = 8; // renamed
1414

15-
const C = 16; // copied
15+
public const C = 16; // copied
1616

17-
const U = 32; // updated but unmerged
17+
public const U = 32; // updated but unmerged
1818

19-
const N = 64; // untracked
19+
public const N = 64; // untracked
2020

21-
const PATTERN = '/^\s?(?<X>[A|M|D|R|C|U|\?]{1,2}| )(?<Y>[A|M|D|R|C|U|\?]{1,2}| )\s(?<file>\S+)(\s->\S+)?$/';
21+
public const PATTERN = '/^\s?(?<X>[A|M|D|R|C|U|\?]{1,2}| )(?<Y>[A|M|D|R|C|U|\?]{1,2}| )\s(?<file>\S+)(\s\->\S+)?$/';
2222

2323
/**
2424
* @var string
@@ -116,10 +116,7 @@ public function isCopied(): bool
116116
return $this->X & static::C || $this->Y & static::C;
117117
}
118118

119-
/**
120-
* @return string
121-
*/
122-
public function __toString()
119+
public function __toString(): string
123120
{
124121
return $this->line;
125122
}

‎src/Git/ChangedFiles.php‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ public function __construct(string $log)
1717

1818
$this->files = collect($files)
1919
->filter()
20-
->map(function (string $line) {
21-
return new ChangedFile($line);
22-
});
20+
->map(fn (string $line) => new ChangedFile($line));
2321
}
2422

2523
/**
@@ -37,38 +35,30 @@ public function getFiles(): Collection
3735
*/
3836
public function getStaged(): Collection
3937
{
40-
return $this->files->filter(function (ChangedFile $file) {
41-
return $file->isStaged();
42-
});
38+
return $this->files->filter(fn (ChangedFile $file) => $file->isStaged());
4339
}
4440

4541
/**
4642
* @return Collection<int, ChangedFile>
4743
*/
4844
public function getAddedToCommit(): Collection
4945
{
50-
return $this->files->filter(function (ChangedFile $file) {
51-
return $file->isInCommit();
52-
});
46+
return $this->files->filter(fn (ChangedFile $file) => $file->isInCommit());
5347
}
5448

5549
/**
5650
* @return Collection<int, ChangedFile>
5751
*/
5852
public function getDeleted(): Collection
5953
{
60-
return $this->files->filter(function (ChangedFile $file) {
61-
return $file->isDeleted();
62-
});
54+
return $this->files->filter(fn (ChangedFile $file) => $file->isDeleted());
6355
}
6456

6557
/**
6658
* @return Collection<int, ChangedFile>
6759
*/
6860
public function getUntracked(): Collection
6961
{
70-
return $this->files->filter(function (ChangedFile $file) {
71-
return $file->isUntracked();
72-
});
62+
return $this->files->filter(fn (ChangedFile $file) => $file->isUntracked());
7363
}
7464
}

0 commit comments

Comments
 (0)