Adjust tests and rules

Drops the single line rule for docblocks and aligns tests with
expectations.

Author: rdohms

src/DMS/ruleset.xml

@@ -6,6 +6,7 @@
     <rule ref="Doctrine">
         <exclude name="Squiz.PHP.GlobalKeyword" />
         <exclude name="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment"/>
+        <exclude name="SlevomatCodingStandard.Commenting.RequireOneLineDocComment"/>
     </rule>
 
     <!-- Require presence of declare(strict_types=1) -->
@@ -23,4 +24,6 @@
             <property name="spacesCountBeforeColon" value="0"/>
         </properties>
     </rule>
+
+
 </ruleset>

tests/expected_report.txt

@@ -4,15 +4,15 @@ PHP CODE SNIFFER REPORT SUMMARY
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 tests/input/concatenation_spacing.php                 55      0
-tests/input/example-class.php                         36      0
+tests/input/example-class.php                         38      0
 tests/input/not_spacing.php                           7       0
-tests/input/return_type_on_closures.php               27      0
-tests/input/return_type_on_methods.php                13      0
+tests/input/return_type_on_closures.php               32      0
+tests/input/return_type_on_methods.php                18      0
 tests/input/test-case.php                             7       0
 ----------------------------------------------------------------------
-A TOTAL OF 145 ERRORS AND 0 WARNINGS WERE FOUND IN 6 FILES
+A TOTAL OF 157 ERRORS AND 0 WARNINGS WERE FOUND IN 6 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 134 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 146 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

tests/fixed/example-class.php

@@ -25,29 +25,17 @@ class Example implements IteratorAggregate
 {
     private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
 
-    private ?int $foo = null;
-
-    /**
-     * @var string[]
-     */
-    private array $bar;
-
-    private bool $baz;
-
     private ControlStructureSniff|int|string|null $baxBax = null;
 
-    public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
+    public function __construct(private int|null $foo = null, private array $bar = [], private bool $baz = false, $baxBax = 'unused')
     {
-        $this->foo    = $foo;
-        $this->bar    = $bar;
-        $this->baz    = $baz;
         $this->baxBax = $baxBax;
     }
 
     /**
      * Description
      */
-    public function getFoo(): ?int
+    public function getFoo(): int|null
     {
         return $this->foo;
     }

tests/fixed/return_type_on_closures.php

@@ -22,7 +22,7 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }
 
@@ -31,7 +31,7 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }
 
@@ -40,7 +40,7 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }
 
@@ -49,7 +49,7 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }
 
@@ -58,6 +58,6 @@ static function (
     int $c,
     int $d,
     int $e,
-    int $b
+    int $b,
 ): void {
 }

tests/fixed/return_type_on_methods.php

@@ -31,7 +31,7 @@ public function f(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 
@@ -40,7 +40,7 @@ public function g(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 
@@ -49,7 +49,7 @@ public function h(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 
@@ -58,7 +58,7 @@ public function i(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 
@@ -67,7 +67,7 @@ public function j(
         int $c,
         int $d,
         int $e,
-        int $b
+        int $b,
     ): void {
     }
 }