adjust phpcs config based on feedback

juliusstoerrle · Oct 26, 2024 · 6039028 · 6039028
1 parent a8e18d7
commit 6039028
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 16 deletions.
diff --git a/webservice/.php-cs-fixer.dist.php b/webservice/.php-cs-fixer.dist.php
@@ -13,14 +13,6 @@
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'array_syntax' => ['syntax' => 'short'], // part of PERCS2.0 included in sf
-        'no_null_property_initialization' => true, // part of Sf coding standard
-        'nullable_type_declaration_for_default_null_value' => true, // part of Sf coding standard
-        'phpdoc_order' => true, // part of Sf coding standard
-        'phpdoc_types_order' => [ // part of Sf coding standard
-            'null_adjustment' => 'always_last',
-            'sort_algorithm' => 'none',
-        ],
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
         'native_constant_invocation' => [
@@ -33,19 +25,12 @@
             'comment_text' => 'Intentional: No break',
         ],
         'non_printable_character' => false, // As of PHP 7, they can be masked in strings (Not included in @Symfony)
-        'protected_to_private' => false, // Not included in @Symfony
-        'phpdoc_no_empty_return' => false, // Not included in@Symfony
-        'ordered_class_elements' => false, // Not included in @Symfony
-        'ordered_imports' => [ 
-            'imports_order' => ['class', 'const', 'function'], // differs from @Symfony
-        ],
         'global_namespace_import' => [ // differs from Symfony Coding Standard
             'import_classes' => true,
             'import_constants' => true,
             'import_functions' => true,
         ],
-        'ordered_traits' => false, // Not included in @Symfony
-        'phpdoc_to_comment' => false, // differs from @Symfony
+        'phpdoc_to_comment' => false, // differs from @Symfony, needed for higher PHPStan / lower PSalm levels
         'pow_to_exponentiation' => true,
         'declare_strict_types' => true,
     ])

diff --git a/webservice/config/bundles.php b/webservice/config/bundles.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],

diff --git a/webservice/config/preload.php b/webservice/config/preload.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
     require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
 }
diff --git a/webservice/importmap.php b/webservice/importmap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * Returns the importmap for this application.
  *

diff --git a/webservice/public/index.php b/webservice/public/index.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Kernel;
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';

diff --git a/webservice/src/Kernel.php b/webservice/src/Kernel.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App;
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;

diff --git a/webservice/tests/bootstrap.php b/webservice/tests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Symfony\Component\Dotenv\Dotenv;
 
 require dirname(__DIR__).'/vendor/autoload.php';