added new warning and QuickFix for it: lack of declare(strict_types=1…

…) section

new rules for .gitignore
new tests
refactored warnings

.gitignore

@@ -7,3 +7,4 @@ y.output
 .idea
 vendor
 dev
+src/tests/golden/testdata/quickfix/*.fix

src/ir/irutil/keyword.go

@@ -14,6 +14,8 @@ func Keywords(n ir.Node) []*token.Token {
 	switch n := n.(type) {
 	case *ir.FunctionStmt:
 		return []*token.Token{n.FunctionTkn}
+	case *ir.DeclareStmt:
+		return []*token.Token{n.DeclareTkn}
 	case *ir.DefaultStmt:
 		return []*token.Token{n.DefaultTkn}
 	case *ir.CaseStmt:

src/linter/block_linter.go

@@ -1537,6 +1537,10 @@ func (b *blockLinter) metaInfo() *meta.Info {
 }
 
 func (b *blockLinter) checkDeclareStrictTypes(statement *ir.DeclareStmt) {
+	if b.walker.r.strictTypes {
+		return
+	}
+
 	for _, i := range statement.Consts {
 		node, ok := i.(*ir.ConstantStmt)
 		if !ok {
@@ -1546,6 +1550,7 @@ func (b *blockLinter) checkDeclareStrictTypes(statement *ir.DeclareStmt) {
 		if node.ConstantName.Value != "strict_types" {
 			return
 		}
+
 		value, isNumber := node.Expr.(*ir.Lnumber)
 		if !isNumber {
 			return
@@ -1555,7 +1560,7 @@ func (b *blockLinter) checkDeclareStrictTypes(statement *ir.DeclareStmt) {
 			return
 		}
 
-		b.report(statement, LevelError, "notStrictTypes", "strict_types value is not 1")
+		b.report(statement, LevelWarning, "notStrictTypes", "strict_types value is not 1")
 		b.walker.r.addQuickFix("notStrictTypes", b.quickfix.StrictTypes(value))
 	}
 }

src/linter/quickfix.go

@@ -42,6 +42,14 @@ func (g *QuickFixGenerator) StrictTypes(lnumber *ir.Lnumber) quickfix.TextEdit {
 	}
 }
 
+func (g *QuickFixGenerator) CreateDeclareStrictTypes(root *ir.Root) quickfix.TextEdit {
+	return quickfix.TextEdit{
+		StartPos:    root.Position.StartPos,
+		EndPos:      root.Position.StartPos,
+		Replacement: "declare(strict_types=1);\n",
+	}
+}
+
 func (g *QuickFixGenerator) NullForNotNullableProperty(prop *ir.PropertyStmt) quickfix.TextEdit {
 	from := prop.Position.StartPos
 	to := prop.Variable.Position.EndPos

src/linter/report.go

@@ -34,6 +34,15 @@ func addBuiltinCheckers(reg *CheckersRegistry) {
 			After:    `declare(strict_types=1);`,
 		},
 
+		{
+			Name:     "noDeclareSection",
+			Default:  true,
+			Quickfix: true,
+			Comment:  "Report declare(strict_types=1) has not been set.",
+			Before:   ` `,
+			After:    `declare(strict_types=1);`,
+		},
+
 		{
 			Name:     "emptyStmt",
 			Default:  true,
@@ -1194,8 +1203,8 @@ func DiffReports(gitRepo string, diffArgs []string, changesList []git.Change, ch
 		}
 	}
 
-	old := reportListToMap(oldList)
-	new := reportListToMap(newList)
+	oldReportMap := reportListToMap(oldList)
+	newReportMap := reportListToMap(newList)
 	changes := gitChangesToMap(changesList)
 
 	var mu sync.Mutex
@@ -1205,7 +1214,7 @@ func DiffReports(gitRepo string, diffArgs []string, changesList []git.Change, ch
 
 	limitCh := make(chan struct{}, maxConcurrency)
 
-	for filename, list := range new {
+	for filename, list := range newReportMap {
 		wg.Add(1)
 		go func(filename string, list []*Report) {
 			limitCh <- struct{}{}
@@ -1221,7 +1230,7 @@ func DiffReports(gitRepo string, diffArgs []string, changesList []git.Change, ch
 				oldName = filename // full diff mode
 			}
 
-			reports, err := diffReportsList(gitRepo, ignoreCommits, diffArgs, filename, c, old[oldName], list)
+			reports, err := diffReportsList(gitRepo, ignoreCommits, diffArgs, filename, c, oldReportMap[oldName], list)
 			if err != nil {
 				mu.Lock()
 				resErr = err
@@ -1275,8 +1284,8 @@ func diffReportsList(gitRepo string, ignoreCommits map[string]struct{}, diffArgs
 		}
 	}
 
-	old, oldMaxLine := reportListToPerLineMap(oldList)
-	new, newMaxLine := reportListToPerLineMap(newList)
+	oldPerLineMap, oldMaxLine := reportListToPerLineMap(oldList)
+	newPerLineMap, newMaxLine := reportListToPerLineMap(newList)
 
 	var maxLine = oldMaxLine
 	if newMaxLine > maxLine {
@@ -1293,17 +1302,17 @@ func diffReportsList(gitRepo string, ignoreCommits map[string]struct{}, diffArgs
 		// just deletion
 		if ok && ch.new.HaveRange && ch.new.Range == 0 {
 			oldLine = ch.old.To
-			newLine-- // cancel the increment of newLine, because code was deleted, no new lines added
+			newLine-- // cancel the increment of newLine, because code was deleted, no newPerLineMap lines added
 			continue
 		}
 
-		res = maybeAppendReports(res, new, old, newLine, oldLine, blame, ignoreCommits)
+		res = maybeAppendReports(res, newPerLineMap, oldPerLineMap, newLine, oldLine, blame, ignoreCommits)
 
 		if ok {
 			oldLine = 0 // all changes and additions must be checked
 			for j := newLine + 1; j <= ch.new.To; j++ {
 				newLine = j
-				res = maybeAppendReports(res, new, old, newLine, oldLine, blame, ignoreCommits)
+				res = maybeAppendReports(res, newPerLineMap, oldPerLineMap, newLine, oldLine, blame, ignoreCommits)
 			}
 			oldLine = ch.old.To
 		}

src/linter/root.go

@@ -69,10 +69,12 @@ type rootWalker struct {
 	// name matches the pattern and @linter disable was encountered
 
 	// strictTypes is true if file contains `declare(strict_types=1)`.
-	strictTypes bool
-	strictMixed bool
+	strictTypes    bool
+	strictMixed    bool
+	declareSection bool
 
-	reports []*Report
+	reports  []*Report
+	quickfix *QuickFixGenerator
 
 	config *Config
 
@@ -141,7 +143,12 @@ func (d *rootWalker) EnterNode(n ir.Node) (res bool) {
 			}
 			if c.ConstantName.Value == "strict_types" {
 				v, ok := c.Expr.(*ir.Lnumber)
-				if ok && v.Value == "1" {
+				if !ok {
+					continue
+				}
+
+				d.declareSection = true
+				if v.Value == "1" {
 					d.strictTypes = true
 				}
 			}

src/linter/worker.go

@@ -315,6 +315,11 @@ func (w *Worker) analyzeFile(file *workspace.File, rootNode *ir.Root) (*rootWalk
 	}
 	walker.afterLeaveFile()
 
+	if !walker.declareSection {
+		walker.Report(rootNode, LevelWarning, "noDeclareSection", "You have no declare section with strict_types=1 argument")
+		walker.addQuickFix("notStrictTypes", walker.quickfix.CreateDeclareStrictTypes(rootNode))
+	}
+
 	if len(walker.ctx.fixes) != 0 {
 		needApplyFixes := !file.AutoGenerated() || w.config.CheckAutoGenerated
 

src/tests/golden/testdata/quickfix/arraySyntax.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 class Foo {}
 
 $_ = [1,2,3];

src/tests/golden/testdata/quickfix/binaryOp.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 function binaryOp() {
     $x += $y;
     $x -= $y;

src/tests/golden/testdata/quickfix/callSimplify.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 $array = ['a' => 1, 'b' => 2, 'c' => 3];
 
 if (array_key_exists('z', $array)) { // 2

src/tests/golden/testdata/quickfix/complexExamples.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 function foo(array $a) { return 0; }
 
 $_ = [isset($x) ? $x : $y]; // expressions in global scope

src/tests/golden/testdata/quickfix/constCase.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 function f($a) {
     if ($a === null) {
         return false;

src/tests/golden/testdata/quickfix/declareStrictTypes.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 0);
+declare(strict_types=0);
 
 function test():string {
     return "test";

src/tests/golden/testdata/quickfix/declareStrictTypes.php.fix.expected

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 function test():string {
     return "test";

src/tests/golden/testdata/quickfix/getTypeMisUse.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 function getTypeMisUse(mixed $var) {
   if (is_string($var)) {
   }

src/tests/golden/testdata/quickfix/indexingSyntax.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 $b = [];
 $_ = $b[0];
 $_ = $b[0][0];

src/tests/golden/testdata/quickfix/noDeclareStrictTypesSection_1.php

@@ -0,0 +1,4 @@
+<?php
+function test():string {
+    return "test";
+}

src/tests/golden/testdata/quickfix/noDeclareStrictTypesSection_1.php.fix.expected

@@ -0,0 +1,5 @@
+<?php
+declare(strict_types=1);
+function test():string {
+    return "test";
+}

src/tests/golden/testdata/quickfix/noDeclareStrictTypesSection_2.php

@@ -0,0 +1,5 @@
+<?php
+declare(ticks=1);
+function test():string {
+    return "test";
+}

src/tests/golden/testdata/quickfix/noDeclareStrictTypesSection_2.php.fix.expected

@@ -0,0 +1,6 @@
+<?php
+declare(strict_types=1);
+declare(ticks=1);
+function test():string {
+    return "test";
+}

src/tests/golden/testdata/quickfix/propNullDefault.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 class Boo {}
 class Zoo {}
 

src/tests/golden/testdata/quickfix/ternarySimplify.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 $a = 5;
 function f(): int {
     global $a;

src/tests/golden/testdata/quickfix/trailingComma.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 function f() {
     $_ = [10, 20, 30]; // ok
 

src/tests/golden/testdata/quickfix/unaryRepeat.php.fix.expected

@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 function unaryRepeat() {
   $a = 100;