Merge pull request #8386 from paulbalandan/coding-standard

refactor: remove overrides for coding-standard v1.7.12
codeigniter4 · Dec 29, 2023 · 4c3f90c · 4c3f90c
2 parents e5e2fda + 08043b2
commit 4c3f90c
Show file tree

Hide file tree

Showing 11 changed files with 453 additions and 540 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -43,56 +43,7 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [
-    'php_unit_data_provider_name' => [
-        'prefix' => 'provide',
-        'suffix' => '',
-    ],
-    'php_unit_data_provider_static'      => true,
-    'php_unit_data_provider_return_type' => true,
-    'no_extra_blank_lines'               => [
-        'tokens' => [
-            'attribute',
-            'break',
-            'case',
-            'continue',
-            'curly_brace_block',
-            'default',
-            'extra',
-            'parenthesis_brace_block',
-            'return',
-            'square_brace_block',
-            'switch',
-            'throw',
-            'use',
-        ],
-    ],
-    'fully_qualified_strict_types' => [
-        'import_symbols'                        => false,
-        'leading_backslash_in_global_namespace' => false,
-        'phpdoc_tags'                           => [
-            'param',
-            'phpstan-param',
-            'phpstan-property',
-            'phpstan-property-read',
-            'phpstan-property-write',
-            'phpstan-return',
-            'phpstan-var',
-            'property',
-            'property-read',
-            'property-write',
-            'psalm-param',
-            'psalm-property',
-            'psalm-property-read',
-            'psalm-property-write',
-            'psalm-return',
-            'psalm-var',
-            'return',
-            'throws',
-            'var',
-        ],
-    ],
-];
+$overrides = [];
 
 $options = [
     'cacheFile' => 'build/.php-cs-fixer.cache',

diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php
@@ -29,31 +29,7 @@
         __DIR__ . '/admin/starter/builds',
     ]);
 
-$overrides = [
-    'php_unit_data_provider_name' => [
-        'prefix' => 'provide',
-        'suffix' => '',
-    ],
-    'php_unit_data_provider_static'      => true,
-    'php_unit_data_provider_return_type' => true,
-    'no_extra_blank_lines'               => [
-        'tokens' => [
-            'attribute',
-            'break',
-            'case',
-            'continue',
-            'curly_brace_block',
-            'default',
-            'extra',
-            'parenthesis_brace_block',
-            'return',
-            'square_brace_block',
-            'switch',
-            'throw',
-            'use',
-        ],
-    ],
-];
+$overrides = [];
 
 $options = [
     'cacheFile' => 'build/.php-cs-fixer.no-header.cache',

diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php
@@ -31,33 +31,10 @@
     ]);
 
 $overrides = [
-    'echo_tag_syntax'                    => false,
-    'php_unit_internal_class'            => false,
-    'no_unused_imports'                  => false,
-    'class_attributes_separation'        => false,
-    'php_unit_data_provider_return_type' => true,
-    'no_extra_blank_lines'               => [
-        'tokens' => [
-            'attribute',
-            'break',
-            'case',
-            'continue',
-            'curly_brace_block',
-            'default',
-            'extra',
-            'parenthesis_brace_block',
-            'return',
-            'square_brace_block',
-            'switch',
-            'throw',
-            'use',
-        ],
-    ],
-    'php_unit_data_provider_static' => true,
-    'php_unit_data_provider_name'   => [
-        'prefix' => 'provide',
-        'suffix' => '',
-    ],
+    'echo_tag_syntax'             => false,
+    'php_unit_internal_class'     => false,
+    'no_unused_imports'           => false,
+    'class_attributes_separation' => false,
 ];
 
 $options = [

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
@@ -18,7 +18,7 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "codeigniter/coding-standard": "^1.5",
+        "codeigniter/coding-standard": "^1.7",
         "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "^3.43",
         "kint-php/kint": "^5.0.4",

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "codeigniter/coding-standard": "^1.5",
+        "codeigniter/coding-standard": "^1.7",
         "codeigniter/phpstan-codeigniter": "^1.4",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",

diff --git a/tests/system/AutoReview/FrameworkCodeTest.php b/tests/system/AutoReview/FrameworkCodeTest.php
@@ -73,14 +73,14 @@ public function testEachTestClassHasCorrectGroupAnnotation(string $class): void
         ));
     }
 
-    public function provideEachTestClassHasCorrectGroupAnnotation(): iterable
+    public static function provideEachTestClassHasCorrectGroupAnnotation(): iterable
     {
-        foreach ($this->getTestClasses() as $class) {
+        foreach (self::getTestClasses() as $class) {
             yield $class => [$class];
         }
     }
 
-    private function getTestClasses(): array
+    private static function getTestClasses(): array
     {
         if (self::$testClasses !== []) {
             return self::$testClasses;

diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php
@@ -60,9 +60,9 @@ public function testConstructor(
         $this->assertSame($expectedTotalSegments, $uri->getTotalSegments());
     }
 
-    public function provideConstructor(): iterable
+    public static function provideConstructor(): iterable
     {
-        return array_merge($this->provideSetPath(), $this->provideRelativePathWithQueryOrFragment());
+        return array_merge(self::provideSetPath(), self::provideRelativePathWithQueryOrFragment());
     }
 
     public static function provideSetPath(): iterable
@@ -214,7 +214,7 @@ public static function provideSetPath(): iterable
         ];
     }
 
-    public function provideRelativePathWithQueryOrFragment()
+    public static function provideRelativePathWithQueryOrFragment(): iterable
     {
         return [
             'one/two?foo=1&bar=2' => [