Increase upper limit requirement on phpstan (#21)

juliangut · mremi · commit 3a038b0e5187 · 2020-01-02T09:04:04.000+01:00
increase upper limit requirement on phpstan
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ php:
   - '7.1'
   - '7.2'
   - '7.3'
+  - '7.4'
 
 env:
   global:
@@ -20,8 +21,6 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 
-before_install: composer self-update
-
 before_install:
   - composer self-update
   - if [ -x .travis/before_install_${TARGET}.sh ]; then .travis/before_install_${TARGET}.sh; fi;
@@ -34,4 +33,3 @@ script:
 
 after_success:
   - if [ -x .travis/after_success_${TARGET}.sh ]; then .travis/after_success_${TARGET}.sh; fi;
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ master
 
 * todo...
 
+v0.3.0
+------
+
+* Updated to PHPStan 0.12
+* Added testing on PHP 7.4
+
 v0.2.0
 ------
 
diff --git a/README.md b/README.md
@@ -36,14 +36,17 @@ parameters:
 			# enable detection of echo
 			-
 				type: Stmt_Echo
+				functions: null
 
 			# enable detection of eval
 			-
 				type: Expr_Eval
+				functions: null
 
 			# enable detection of die/exit
 			-
 				type: Expr_Exit
+				functions: null
 
 			# enable detection of a set of functions
 			-
diff --git a/composer.json b/composer.json
@@ -17,12 +17,12 @@
     ],
     "require": {
         "php": "^7.1",
-        "phpstan/phpstan": "^0.11"
+        "phpstan/phpstan": "^0.12"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.12",
         "localheinz/composer-normalize": "^1.3",
-        "phpstan/phpstan-phpunit": "^0.11",
+        "phpstan/phpstan-phpunit": "^0.12",
         "phpunit/phpunit": "^7.2",
         "sensiolabs/security-checker": "^5.0",
         "symfony/var-dumper": "^4.3"
diff --git a/extension.neon b/extension.neon
@@ -1,17 +1,29 @@
+parametersSchema:
+	banned_code: structure([
+		nodes: listOf(structure([
+			type: string()
+			functions: schema(listOf(string()), nullable())
+		]))
+		use_from_tests: bool()
+	])
+
 parameters:
 	banned_code:
 		nodes:
 			# enable detection of echo
 			-
 				type: Stmt_Echo
+				functions: null
 
 			# enable detection of eval
 			-
 				type: Expr_Eval
+				functions: null
 
 			# enable detection of die/exit
 			-
 				type: Expr_Exit
+				functions: null
 
 			# enable detection of a set of functions
 			-
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,3 +1,6 @@
+parameters:
+	checkGenericClassInNonGenericObjectType: false
+
 includes:
 	- extension.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon
diff --git a/src/Rules/BannedNodesRule.php b/src/Rules/BannedNodesRule.php
@@ -26,12 +26,12 @@
 class BannedNodesRule implements Rule
 {
     /**
-     * @var array
+     * @var array<array<string, string[]>>
      */
     private $bannedNodes;
 
     /**
-     * @param array $bannedNodes
+     * @param array<array<string, string|string[]>> $bannedNodes
      */
     public function __construct(array $bannedNodes)
     {
diff --git a/tests/Rules/BannedNodesRuleTest.php b/tests/Rules/BannedNodesRuleTest.php
@@ -120,15 +120,15 @@ public function testProcessNodeWithHandledTypes(Expr $node): void
     }
 
     /**
-     * @return \Generator
+     * @return \Generator<array<Include_>>
      */
     public function getUnhandledNodes(): \Generator
     {
         yield [new Include_($this->createMock(Expr::class), Include_::TYPE_INCLUDE)];
     }
 
     /**
-     * @return \Generator
+     * @return \Generator<array<Eval_|Exit_>>
      */
     public function getHandledNodes(): \Generator
     {

Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,17 @@ parameters:`
`36`	`36`	`# enable detection of echo`
`37`	`37`	`-`
`38`	`38`	`type: Stmt_Echo`
	`39`	`+ functions: null`
`39`	`40`
`40`	`41`	`# enable detection of eval`
`41`	`42`	`-`
`42`	`43`	`type: Expr_Eval`
	`44`	`+ functions: null`
`43`	`45`
`44`	`46`	`# enable detection of die/exit`
`45`	`47`	`-`
`46`	`48`	`type: Expr_Exit`
	`49`	`+ functions: null`
`47`	`50`
`48`	`51`	`# enable detection of a set of functions`
`49`	`52`	`-`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@`
`26`	`26`	`class BannedNodesRule implements Rule`
`27`	`27`	`{`
`28`	`28`	`/**`
`29`		`- * @var array`
	`29`	`+ * @var array<array<string, string[]>>`
`30`	`30`	`*/`
`31`	`31`	`private $bannedNodes;`
`32`	`32`
`33`	`33`	`/**`
`34`		`- * @param array $bannedNodes`
	`34`	`+ * @param array<array<string, string\|string[]>> $bannedNodes`
`35`	`35`	`*/`
`36`	`36`	`public function __construct(array $bannedNodes)`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,15 +120,15 @@ public function testProcessNodeWithHandledTypes(Expr $node): void`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`/**`
`123`		`- * @return \Generator`
	`123`	`+ * @return \Generator<array<Include_>>`
`124`	`124`	`*/`
`125`	`125`	`public function getUnhandledNodes(): \Generator`
`126`	`126`	`{`
`127`	`127`	`yield [new Include_($this->createMock(Expr::class), Include_::TYPE_INCLUDE)];`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`/**`
`131`		`- * @return \Generator`
	`131`	`+ * @return \Generator<array<Eval_\|Exit_>>`
`132`	`132`	`*/`
`133`	`133`	`public function getHandledNodes(): \Generator`
`134`	`134`	`{`