Rewrite PSR12.Files.DeclareStatement sniff

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.1.inc

@@ -13,10 +13,10 @@ declare(/* test */ ticks /* test */ =1);
 declare(  ticks
 =1   );
 
-    declare(ticks=1) { }
+    declare(ticks=1) { $test = true; }
 
   declare(ticks=1)
-{ }
+{ $test = true; }
 
 declare(ticks=1)
 {
@@ -48,3 +48,19 @@ declare(ticks=1) {$test = true;
 
 declare(ticks=1) {  $test = true;
 }
+
+// Ensure that we handle non-number values properly.
+declare(encoding='ISO-8859-1');
+declare ( encoding = 'ISO-8859-1' ) ;
+
+// Multi-directive statements should be handled correctly too.
+declare(strict_types=1,ticks=1);
+// Note that PSR12 makes no mention of the formatting of the comma, so all of these should be valid.
+declare(strict_types=1, ticks=1);
+declare(strict_types=1,  ticks=1);
+declare(strict_types=1,
+ticks=1);
+declare(strict_types=1,
+        ticks=1);
+declare(strict_types=1 , ticks=1);
+declare(strict_types=1 ,ticks=1);

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.1.inc.fixed

@@ -13,9 +13,11 @@ declare(/* test */ ticks /* test */ =1);
 declare(ticks=1);
 
     declare(ticks=1) {
+        $test = true;
     }
 
   declare(ticks=1) {
+      $test = true;
   }
 
 declare(ticks=1) {
@@ -26,7 +28,8 @@ declare(ticks=1) {
 }//end comment
 
 declare(ticks=1) {
-}$x =1;
+}
+$x =1;
 
     declare(ticks=1) {
       $test = true;
@@ -36,19 +39,36 @@ declare(ticks // phpcs:ignore Standard.Category.SniffName -- fixing is undesirab
 =1);
 
 declare(ticks=1) {
-}$x =1; // phpcs:ignore Standard.Category.SniffName -- fixing is undesirable
+}
+$x =1; // phpcs:ignore Standard.Category.SniffName -- fixing is undesirable
 
 declare(ticks=1) { // test
 }
 
 declare(ticks=1) {
-$test = true;
+    $test = true;
 }
 
         declare(ticks=1) { /* test */  /* test */
-$test = true;
+            $test = true;
         }
 
 declare(ticks=1) {
-$test = true;
+    $test = true;
 }
+
+// Ensure that we handle non-number values properly.
+declare(encoding='ISO-8859-1');
+declare(encoding='ISO-8859-1');
+
+// Multi-directive statements should be handled correctly too.
+declare(strict_types=1,ticks=1);
+// Note that PSR12 makes no mention of the formatting of the comma, so all of these should be valid.
+declare(strict_types=1, ticks=1);
+declare(strict_types=1,  ticks=1);
+declare(strict_types=1,
+ticks=1);
+declare(strict_types=1,
+        ticks=1);
+declare(strict_types=1 , ticks=1);
+declare(strict_types=1 ,ticks=1);

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.10.inc

@@ -0,0 +1,3 @@
+<?php
+// Parse error. Missing directive value.
+declare(ticks=)

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.11.inc

@@ -0,0 +1,3 @@
+<?php
+// Parse error. Missing semicolon (or PHP close tag).
+declare(ticks=1)

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.12.inc

@@ -0,0 +1,3 @@
+<?php
+// Parse error. Missing closing curly bracket
+declare(ticks=1) {

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.3.inc

@@ -0,0 +1,6 @@
+<?php
+
+// This is a parse error, but the sniff should still handle this correctly.
+declare($something = $value);
+
+const STRICT_TYPES = 1;

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.4.inc

@@ -0,0 +1,64 @@
+<?php
+declare(ticks=1);
+declare (ticks=1);
+declare( ticks=1);
+declare(ticks =1);
+declare(ticks= 1);
+declare(ticks=1 );
+declare(ticks=1) ;
+declare	(ticks=1);
+declare(	ticks=1);
+declare(ticks	=1);
+declare(ticks=	1);
+declare(ticks=1	);
+declare(ticks=1)	;
+declare 	 (ticks=1);
+declare( 	 ticks=1);
+declare(ticks 	 =1);
+declare(ticks= 	 1);
+declare(ticks=1 	 );
+declare(ticks=1) 	 ;
+declare
+(ticks=1);
+declare(
+ticks=1);
+declare(ticks
+=1);
+declare(ticks=
+1);
+declare(ticks=1
+);
+declare(ticks=1)
+;
+declare 
+ (ticks=1);
+declare( 
+ ticks=1);
+declare(ticks 
+ =1);
+declare(ticks= 
+ 1);
+declare(ticks=1 
+ );
+declare(ticks=1) 
+ ;
+declare/* test */(ticks=1);
+declare(/* test */ticks=1);
+declare(ticks/* test */=1);
+declare(ticks=/* test */1);
+declare(ticks=1/* test */);
+declare(ticks=1)/* test */;
+declare(ticks=1);/* test */
+declare// test
+(ticks=1);
+declare(// test
+ticks=1);
+declare(ticks// test
+=1);
+declare(ticks=// test
+1);
+declare(ticks=1// test
+);
+declare(ticks=1)// test
+;
+declare(ticks=1);// test

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.4.inc.fixed

@@ -0,0 +1,52 @@
+<?php
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare(ticks=1);
+declare/* test */(ticks=1);
+declare(/* test */ticks=1);
+declare(ticks/* test */=1);
+declare(ticks=/* test */1);
+declare(ticks=1/* test */);
+declare(ticks=1)/* test */;
+declare(ticks=1);/* test */
+declare// test
+(ticks=1);
+declare(// test
+ticks=1);
+declare(ticks// test
+=1);
+declare(ticks=// test
+1);
+declare(ticks=1// test
+);
+declare(ticks=1)// test
+;
+declare(ticks=1);// test

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.5.inc

@@ -0,0 +1,23 @@
+<?php declare(strict_types=1); ?>
+The line above is correct. The line below should complain that it's not the first line.
+<?php declare(strict_types=1); ?>
+
+This line should complain. It's included because the optional semicolon is missing here.
+<?php declare(strict_types=1) ?>
+
+This should complain that all three parts are not on the first line of the file.
+<?php
+declare(strict_types=1);
+?>
+
+This is fine because it's not strict_types.
+<?php declare(ticks=1); ?>
+
+These can be automatically fixed because there is an incorect number of spaces
+between the end of the declare statement and the closing PHP tag.
+<?php declare(ticks=1)?>
+<?php declare(ticks=1)  ?>
+<?php declare(ticks=1)/* test */?>
+
+This is missing its closing PHP tag. It should be the last test in this file.
+<?php declare(strict_types=1);

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.5.inc.fixed

@@ -0,0 +1,22 @@
+<?php declare(strict_types=1); ?>
+The line above is correct. The line below should complain that it's not the first line.
+<?php declare(strict_types=1); ?>
+
+This line should complain. It's included because the optional semicolon is missing here.
+<?php declare(strict_types=1) ?>
+
+This should complain that all three parts are not on the first line of the file.
+<?php
+declare(strict_types=1); ?>
+
+This is fine because it's not strict_types.
+<?php declare(ticks=1); ?>
+
+These can be automatically fixed because there is an incorect number of spaces
+between the end of the declare statement and the closing PHP tag.
+<?php declare(ticks=1) ?>
+<?php declare(ticks=1) ?>
+<?php declare(ticks=1)/* test */?>
+
+This is missing its closing PHP tag. It should be the last test in this file.
+<?php declare(strict_types=1);

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.6.inc

@@ -0,0 +1,3 @@
+<?php
+// Parse error. Missing opening parenthesis.
+declare

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.7.inc

@@ -0,0 +1,3 @@
+<?php
+// Parse error. Missing closing parenthesis.
+declare(

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.8.inc

@@ -0,0 +1,3 @@
+<?php
+// Parse error. Missing directive.
+declare()

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.9.inc

@@ -0,0 +1,3 @@
+<?php
+// Parse error. Missing equals sign.
+declare(ticks)

src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php

@@ -46,19 +46,77 @@ public function getErrorList($testFile = '')
                     10 => 1,
                     11 => 3,
                     12 => 2,
-                    13 => 1,
-                    14 => 2,
+                    13 => 2,
+                    14 => 1,
                     16 => 3,
+                    18 => 1,
                     19 => 3,
-                    22 => 1,
+                    21 => 1,
                     24 => 1,
-                    26 => 3,
+                    26 => 2,
                     28 => 3,
                     34 => 2,
+                    38 => 1,
                     43 => 1,
                     46 => 1,
                     47 => 1,
                     49 => 1,
+                    54 => 6,
+                ];
+            case 'DeclareStatementUnitTest.4.inc':
+                return [
+                    3  => 1,
+                    4  => 1,
+                    5  => 1,
+                    6  => 1,
+                    7  => 1,
+                    8  => 1,
+                    9  => 1,
+                    10 => 1,
+                    11 => 1,
+                    12 => 1,
+                    13 => 1,
+                    14 => 1,
+                    15 => 1,
+                    16 => 1,
+                    17 => 1,
+                    18 => 1,
+                    19 => 1,
+                    20 => 1,
+                    21 => 1,
+                    23 => 1,
+                    25 => 1,
+                    27 => 1,
+                    29 => 1,
+                    31 => 1,
+                    33 => 1,
+                    35 => 1,
+                    37 => 1,
+                    39 => 1,
+                    41 => 1,
+                    43 => 1,
+                    45 => 1,
+                    46 => 1,
+                    47 => 1,
+                    48 => 1,
+                    49 => 1,
+                    50 => 1,
+                    52 => 1,
+                    54 => 1,
+                    56 => 1,
+                    58 => 1,
+                    60 => 1,
+                    62 => 1,
+                ];
+            case 'DeclareStatementUnitTest.5.inc':
+                return [
+                    3  => 1,
+                    6  => 1,
+                    10 => 2,
+                    18 => 1,
+                    19 => 1,
+                    20 => 1,
+                    23 => 1,
                 ];
             default:
                 return [];