Merge pull request #244 from TheDragonCode/5.x

Added `declare_strict_types` rule
TheDragonCode · Feb 28, 2025 · 784218a · 784218a
2 parents ef7d575 + 9628e92
commit 784218a
Show file tree

Hide file tree

Showing 32 changed files with 66 additions and 10 deletions.
diff --git a/app/Factories/ConfigurationResolverFactory.php b/app/Factories/ConfigurationResolverFactory.php
@@ -37,7 +37,7 @@ public static function fromIO(InputInterface $input, OutputInterface $output): a
 
         $preset = $configuration->preset();
 
-        abort_unless(in_array($preset, static::presets()), 1, 'Preset not found.');
+        abort_unless(in_array($preset, static::presets(), true), 1, 'Preset not found.');
 
         $resolver = static::resolver($input, $output, $path, $configuration, $preset);
 
@@ -58,11 +58,11 @@ protected static function resolver(
         array $path,
         ConfigurationJsonRepository $configuration,
         string $preset,
-    ) {
+    ): ConfigurationResolver {
         return new ConfigurationResolver(
             new Config('default'),
             [
-                'allow-risky' => static::allowRisky($input),
+                'allow-risky' => 'yes',
                 'config'      => implode(DIRECTORY_SEPARATOR, [
                     dirname(__DIR__, 2),
                     'resources',
@@ -98,16 +98,11 @@ protected static function paths(InputInterface $input): array
         return Project::paths($input);
     }
 
-    protected static function configuration()
+    protected static function configuration(): ConfigurationJsonRepository
     {
         return resolve(ConfigurationJsonRepository::class);
     }
 
-    protected static function allowRisky(InputInterface $input): string
-    {
-        return $input->getOption('risky') ? 'yes' : 'no';
-    }
-
     protected static function presets(): array
     {
         return PhpVersion::values();

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DragonCode\CodeStyler\Providers;
 
 use App\Repositories\ConfigurationJsonRepository as ConfigurationJsonRepositoryConcern;

diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
 |--------------------------------------------------------------------------
 | Create The Application

diff --git a/config/app.php b/config/app.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use DragonCode\CodeStyler\Providers\ActionsServiceProvider;
 use DragonCode\CodeStyler\Providers\AppServiceProvider;
 use DragonCode\CodeStyler\Providers\CommandsServiceProvider;

diff --git a/config/commands.php b/config/commands.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use DragonCode\CodeStyler\Commands\DefaultCommand;
 use DragonCode\CodeStyler\Commands\DependabotCommand;
 use DragonCode\CodeStyler\Commands\EditorConfigCommand;

diff --git a/resources/presets/default.php b/resources/presets/default.php
@@ -94,7 +94,8 @@
         'position' => 'next_line',
     ],
 
-    'declare_parentheses' => true,
+    'declare_parentheses'  => true,
+    'declare_strict_types' => true,
 
     'escape_implicit_backslashes' => [
         'double_quoted'  => true,

diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use Illuminate\Contracts\Console\Kernel;

diff --git a/tests/Feature/ConfigurationTest.php b/tests/Feature/ConfigurationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use LaravelZero\Framework\Exceptions\ConsoleException;
 
 it('ensures configuration file is valid', function () {

diff --git a/tests/Feature/DirtyTest.php b/tests/Feature/DirtyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Contracts\PathsRepository;
 
 it('determines dirty files', function () {

diff --git a/tests/Feature/Fixers/BinaryOperatorSpacesFixerTest.php b/tests/Feature/Fixers/BinaryOperatorSpacesFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/binary_operator_spaces.php'),

diff --git a/tests/Feature/Fixers/BlankLineBeforeStatementFixerTest.php b/tests/Feature/Fixers/BlankLineBeforeStatementFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/blank_line_before_statement.php'),

diff --git a/tests/Feature/Fixers/BracesFixerTest.php b/tests/Feature/Fixers/BracesFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/braces.php'),

diff --git a/tests/Feature/Fixers/ClassConstructorFixerTest.php b/tests/Feature/Fixers/ClassConstructorFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/class_constructor.php'),

diff --git a/tests/Feature/Fixers/ExtraWhitespacesInSingleLineAnonymousFunctionTest.php b/tests/Feature/Fixers/ExtraWhitespacesInSingleLineAnonymousFunctionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/extra_whitespaces_in_single_line_anonymous_function.php'),

diff --git a/tests/Feature/Fixers/JsonFixerTest.php b/tests/Feature/Fixers/JsonFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/file.json'),

diff --git a/tests/Feature/Fixers/LaravelPhpdocAlignmentFixerTest.php b/tests/Feature/Fixers/LaravelPhpdocAlignmentFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/laravel_phpdoc_alignment.php'),

diff --git a/tests/Feature/Fixers/LaravelPhpdocOrderFixerTest.php b/tests/Feature/Fixers/LaravelPhpdocOrderFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/laravel_phpdoc_order.php'),

diff --git a/tests/Feature/Fixers/LaravelPhpdocSeparationFixerTest.php b/tests/Feature/Fixers/LaravelPhpdocSeparationFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/laravel_phpdoc_separation.php'),

diff --git a/tests/Feature/Fixers/OrderedTypesFixerTest.php b/tests/Feature/Fixers/OrderedTypesFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/ordered_types.php'),

diff --git a/tests/Feature/Fixers/ParenthesesFixerTest.php b/tests/Feature/Fixers/ParenthesesFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/parentheses.php'),

diff --git a/tests/Feature/Fixers/SingleLineEmptyObjectFixerTest.php b/tests/Feature/Fixers/SingleLineEmptyObjectFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/single_line_empty_object.php'),

diff --git a/tests/Feature/Fixers/XmlFixerTest.php b/tests/Feature/Fixers/XmlFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the xml', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/file.xml'),

diff --git a/tests/Feature/Fixers/YamlFixerTest.php b/tests/Feature/Fixers/YamlFixerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('fixes the code', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/fixers/file.yml'),

diff --git a/tests/Feature/FormatTest.php b/tests/Feature/FormatTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('outputs checkstyle format', function () {
     [$statusCode, $output] = run('default', [
         'path'     => base_path('tests/Fixtures/with-fixable-issues'),

diff --git a/tests/Feature/PresetTest.php b/tests/Feature/PresetTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('uses the laravel preset by default', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/without-issues'),

diff --git a/tests/Feature/ProgressTest.php b/tests/Feature/ProgressTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('display progress when fixing issues', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/with-fixable-issues'),

diff --git a/tests/Feature/SummaryTest.php b/tests/Feature/SummaryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('may fail with style issues', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/with-fixable-issues'),

diff --git a/tests/Feature/VerboseTest.php b/tests/Feature/VerboseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 it('displays the code diff', function () {
     [$statusCode, $output] = run('default', [
         'path' => base_path('tests/Fixtures/with-fixable-issues'),

diff --git a/tests/Pest.php b/tests/Pest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
 |--------------------------------------------------------------------------
 | Test Case

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use LaravelZero\Framework\Testing\TestCase as BaseTestCase;

diff --git a/tests/Unit/Repositories/ConfigurationJsonRepositoryTest.php b/tests/Unit/Repositories/ConfigurationJsonRepositoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use DragonCode\CodeStyler\Helpers\PhpVersion;
 use DragonCode\CodeStyler\Repositories\ConfigurationJsonRepository;
 

diff --git a/tests/Unit/ValueObjects/IssueTest.php b/tests/Unit/ValueObjects/IssueTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use App\ValueObjects\Issue;
 
 it('has a description', function () {