Merge pull request #27 from drupol/fix-tests-since-workflow-disable

fix tests since lasts commits break them silently

.github/workflows/tests.yml

@@ -13,8 +13,8 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1', '8.2']
-        phpcsfixer-version: ['3.35.*', '3.*', '*']
+        php-versions: ['8.0', '8.1', '8.2', '8.3']
+        phpcsfixer-version: ['3.*', '*']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

CHANGELOG.md

@@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- replace deprecated rule 'escape_implicit_backslashes' by 'string_implicit_backslashes'
+
+### Removed
+- drop support for php-cs-fixer 3.35.x by removing tests on this version
+
+### Added
+- add running tests on PHP 8.3
+- add rule declare_equal_normalize to support declare(strict_types=1) without spaces around equal for Drupal8
 
 ## [2.1.0] - 2023-10-23
 ### Added

config/drupal8/phpcsfixer.rules.yml

@@ -3,5 +3,7 @@ parameters:
     array_syntax:
       syntax: short
     declare_equal_normalize: true
-    declare_strict_types: true
+    declare_strict_types: false
     blank_lines_before_namespace: false
+    fully_qualified_strict_types:
+        leading_backslash_in_global_namespace: false

src/Fixer/BlankLineBeforeEndOfClass.php

@@ -83,7 +83,7 @@ public function applyFix(SplFileInfo $file, Tokens $tokens): void
             $tokens[$endCurlyBraceIndex] = new Token(
                 [
                     T_WHITESPACE,
-                   $padding . $this->tokens[$endCurlyBraceIndex]->getContent(),
+                    $padding . $this->tokens[$endCurlyBraceIndex]->getContent(),
                 ]
             );
         }

tests/Integration/Scenario5Test.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace drupol\PhpCsFixerConfigsDrupal\Tests\Integration;
+
+use drupol\PhpCsFixerConfigsDrupal\Config\Drupal8;
+use drupol\PhpCsFixerConfigsDrupal\Tests\IntegrationTestCase;
+use PhpCsFixer\FixerFactory;
+use PhpCsFixer\RuleSet\RuleSet;
+
+/**
+ * @author Kevin Wenger <[email protected]>
+ *
+ * Covers the PHP-CS-Fixer rules declare_strict_types & declare_equal_normalize
+ *
+ * @internal
+ */
+final class Scenario5Test extends IntegrationTestCase
+{
+    protected function getScenarioPath(): string
+    {
+        return __DIR__ . '/fixtures/scenario5';
+    }
+
+    public function testDrupal8Config(): void
+    {
+        $drupal8 = new Drupal8();
+        $rules = $drupal8->getRules();
+        $ruleset = new RuleSet($rules);
+
+        $factory = (new FixerFactory())
+            ->registerBuiltInFixers()
+            ->registerCustomFixers($drupal8->getCustomFixers())
+            ->useRuleSet($ruleset);
+
+        $fixers = [];
+        foreach ($factory->getFixers() as $fixer) {
+            $fixers[$fixer->getName()] = $fixer;
+        }
+
+        $this->doTest($fixers);
+    }
+}

tests/Integration/Scenario6Test.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace drupol\PhpCsFixerConfigsDrupal\Tests\Integration;
+
+use drupol\PhpCsFixerConfigsDrupal\Config\Drupal8;
+use drupol\PhpCsFixerConfigsDrupal\Tests\IntegrationTestCase;
+use PhpCsFixer\FixerFactory;
+use PhpCsFixer\RuleSet\RuleSet;
+
+/**
+ * @author Kevin Wenger <[email protected]>
+ *
+ * Covers the PHP-CS-Fixer rules leading_backslash_in_global_namespace
+ *
+ * @internal
+ */
+final class Scenario6Test extends IntegrationTestCase
+{
+    protected function getScenarioPath(): string
+    {
+        return __DIR__ . '/fixtures/scenario6';
+    }
+
+    public function testDrupal8Config(): void
+    {
+        $drupal8 = new Drupal8();
+        $rules = $drupal8->getRules();
+        $ruleset = new RuleSet($rules);
+
+        $factory = (new FixerFactory())
+            ->registerBuiltInFixers()
+            ->registerCustomFixers($drupal8->getCustomFixers())
+            ->useRuleSet($ruleset);
+
+        $fixers = [];
+        foreach ($factory->getFixers() as $fixer) {
+            $fixers[$fixer->getName()] = $fixer;
+        }
+
+        $this->doTest($fixers);
+    }
+}

tests/Integration/fixtures/scenario0/bad.php

@@ -66,7 +66,7 @@
 function sample(? string $str): ? string {}
 
 // Cover single_space_after_construct (default).
-throw  new  \Exception();
+throw  new  Exception();
 // Cover single_space_after_construct (yield_from).
 yield  from  baz();
 

tests/Integration/fixtures/scenario0/good.php

@@ -62,7 +62,7 @@ function foo(array $arg) {
 function sample(?string $str): ?string {}
 
 // Cover single_space_after_construct (default).
-throw new \Exception();
+throw new Exception();
 // Cover single_space_after_construct (yield_from).
 yield from baz();
 

tests/Integration/fixtures/scenario5/bad.php

@@ -0,0 +1,8 @@
+<?php
+
+declare( strict_types = 1 );
+class Bar {
+
+    public $id;
+
+}

tests/Integration/fixtures/scenario5/good.php

@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+class Bar {
+
+    public $id;
+
+}

tests/Integration/fixtures/scenario6/bad.php

@@ -0,0 +1,3 @@
+<?php
+
+throw new \Exception();

tests/Integration/fixtures/scenario6/good.php

@@ -0,0 +1,3 @@
+<?php
+
+throw new Exception();

tests/Unit/Config/Drupal7Test.php

@@ -141,6 +141,7 @@ public function testConfigDefault(): void
                 'mute_deprecation_error' => true,
                 'noise_remaining_usages' => true,
             ],
+            'escape_implicit_backslashes' => true,
             'explicit_indirect_variable' => false,
             'explicit_string_variable' => true,
             'final_class' => false,
@@ -436,7 +437,6 @@ public function testConfigDefault(): void
             'static_lambda' => true,
             'strict_comparison' => true,
             'strict_param' => true,
-            'string_implicit_backslashes' => true,
             'string_length_to_empty' => true,
             'string_line_ending' => true,
             'switch_case_semicolon_to_colon' => true,

tests/Unit/Config/Drupal8Test.php

@@ -111,7 +111,7 @@ public function testConfigDefault(): void
             'date_time_immutable' => false,
             'declare_equal_normalize' => true,
             'declare_parentheses' => true,
-            'declare_strict_types' => true,
+            'declare_strict_types' => false,
             'dir_constant' => true,
             'doctrine_annotation_array_assignment' => [
                 'operator' => ':',
@@ -139,6 +139,7 @@ public function testConfigDefault(): void
                 'mute_deprecation_error' => true,
                 'noise_remaining_usages' => true,
             ],
+            'escape_implicit_backslashes' => true,
             'explicit_indirect_variable' => false,
             'explicit_string_variable' => true,
             'final_class' => false,
@@ -147,7 +148,9 @@ public function testConfigDefault(): void
             'fopen_flag_order' => true,
             'fopen_flags' => true,
             'full_opening_tag' => true,
-            'fully_qualified_strict_types' => true,
+            'fully_qualified_strict_types' => [
+                'leading_backslash_in_global_namespace' => false,
+            ],
             'function_declaration' => [
                 'closure_function_spacing' => 'one',
             ],
@@ -434,7 +437,6 @@ public function testConfigDefault(): void
             'static_lambda' => true,
             'strict_comparison' => true,
             'strict_param' => true,
-            'string_implicit_backslashes' => true,
             'string_length_to_empty' => true,
             'string_line_ending' => true,
             'switch_case_semicolon_to_colon' => true,