Open 0.12-dev

ondrejmirtes · ondrejmirtes · commit 97cde39e6ddb · 2019-11-26T09:13:40.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,3 @@ before_script:
   - if [ "$dependencies" = "highest" ]; then composer update --no-interaction; fi;
 script:
   - vendor/bin/phing
-  - >
-    wget https://github.com/maglnet/ComposerRequireChecker/releases/download/0.2.1/composer-require-checker.phar
-    && php composer-require-checker.phar check composer.json
diff --git a/build.xml b/build.xml
@@ -86,7 +86,7 @@
 		>
 			<arg value="analyse"/>
 			<arg value="-l"/>
-			<arg value="7"/>
+			<arg value="8"/>
 			<arg value="-c"/>
 			<arg path="phpstan.neon"/>
 			<arg path="src"/>
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
 	"prefer-stable": true,
 	"extra": {
 		"branch-alias": {
-			"dev-master": "0.11-dev"
+			"dev-master": "0.12-dev"
 		},
 		"phpstan": {
 			"includes": [
@@ -17,16 +17,16 @@
 	},
 	"require": {
 		"php": "~7.1",
-		"phpstan/phpstan": "^0.11.6",
-		"nikic/php-parser": "^4.0"
+		"phpstan/phpstan": "^0.12",
+		"nikic/php-parser": "^4.3"
 	},
 	"require-dev": {
 		"consistence/coding-standard": "^3.7",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
 		"jakub-onderka/php-parallel-lint": "^1.0",
 		"phing/phing": "^2.16.0",
-		"phpstan/phpstan-strict-rules": "^0.11",
-		"phpstan/phpstan-phpunit": "^0.11",
+		"phpstan/phpstan-strict-rules": "^0.12",
+		"phpstan/phpstan-phpunit": "^0.12",
 		"phpunit/phpunit": "^7.1.3",
 		"slevomat/coding-standard": "^4.5.2",
 		"webmozart/assert": "^1.3.0"
diff --git a/phpcs.xml b/phpcs.xml
@@ -23,7 +23,10 @@
 				@dataProvider,
 				@requires
 			"/>
+			<property name="enableObjectTypeHint" value="false"/>
 		</properties>
+		<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification"/>
+		<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
 	</rule>
 	<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
 	<rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
diff --git a/phpstan.neon b/phpstan.neon
@@ -7,6 +7,4 @@ includes:
 
 parameters:
 	excludes_analyse:
-		- */tests/*/data/*
-	ignoreErrors:
-		- '~^Parameter \#1 \$node \(.*\) of method .*Rule::processNode\(\) should be contravariant with parameter \$node \(PhpParser\\Node\) of method PHPStan\\Rules\\Rule::processNode\(\)$~'
+		- tests/*/data/*
diff --git a/tests/Type/WebMozartAssert/AssertTypeSpecifyingExtensionTest.php b/tests/Type/WebMozartAssert/AssertTypeSpecifyingExtensionTest.php
@@ -4,6 +4,9 @@
 
 use PHPStan\Rules\Rule;
 
+/**
+ * @extends \PHPStan\Testing\RuleTestCase<VariableTypeReportingRule>
+ */
 class AssertTypeSpecifyingExtensionTest extends \PHPStan\Testing\RuleTestCase
 {
 
@@ -138,11 +141,11 @@ public function testExtension(): void
 				107,
 			],
 			[
-				'Variable $aa is: PHPStan\Type\WebMozartAssert\Foo|string',
+				'Variable $aa is: class-string<PHPStan\Type\WebMozartAssert\Foo>|PHPStan\Type\WebMozartAssert\Foo',
 				110,
 			],
 			[
-				'Variable $ab is: array<PHPStan\Type\WebMozartAssert\Foo>',
+				'Variable $ab is: array', // should array<PHPStan\Type\WebMozartAssert\Foo>
 				113,
 			],
 			[
diff --git a/tests/Type/WebMozartAssert/VariableTypeReportingRule.php b/tests/Type/WebMozartAssert/VariableTypeReportingRule.php
@@ -5,6 +5,9 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 
+/**
+ * @implements \PHPStan\Rules\Rule<Node\Expr\Variable>
+ */
 class VariableTypeReportingRule implements \PHPStan\Rules\Rule
 {
 
@@ -13,11 +16,6 @@ public function getNodeType(): string
 		return Node\Expr\Variable::class;
 	}
 
-	/**
-	 * @param \PhpParser\Node\Expr\Variable $node
-	 * @param \PHPStan\Analyser\Scope $scope
-	 * @return string[] errors
-	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
 		if (!is_string($node->name)) {

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@`
`86`	`86`	`>`
`87`	`87`	`<arg value="analyse"/>`
`88`	`88`	`<arg value="-l"/>`
`89`		`- <arg value="7"/>`
	`89`	`+ <arg value="8"/>`
`90`	`90`	`<arg value="-c"/>`
`91`	`91`	`<arg path="phpstan.neon"/>`
`92`	`92`	`<arg path="src"/>`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`
`5`	`5`	`use PHPStan\Rules\Rule;`
`6`	`6`
	`7`	`+/**`
	`8`	`+ * @extends \PHPStan\Testing\RuleTestCase<VariableTypeReportingRule>`
	`9`	`+ */`
`7`	`10`	`class AssertTypeSpecifyingExtensionTest extends \PHPStan\Testing\RuleTestCase`
`8`	`11`	`{`
`9`	`12`
`@@ -138,11 +141,11 @@ public function testExtension(): void`
`138`	`141`	`107,`
`139`	`142`	`],`
`140`	`143`	`[`
`141`		`- 'Variable $aa is: PHPStan\Type\WebMozartAssert\Foo\|string',`
	`144`	`+ 'Variable $aa is: class-string<PHPStan\Type\WebMozartAssert\Foo>\|PHPStan\Type\WebMozartAssert\Foo',`
`142`	`145`	`110,`
`143`	`146`	`],`
`144`	`147`	`[`
`145`		`- 'Variable $ab is: array<PHPStan\Type\WebMozartAssert\Foo>',`
	`148`	`+ 'Variable $ab is: array', // should array<PHPStan\Type\WebMozartAssert\Foo>`
`146`	`149`	`113,`
`147`	`150`	`],`
`148`	`151`	`[`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`use PhpParser\Node;`
`6`	`6`	`use PHPStan\Analyser\Scope;`
`7`	`7`
	`8`	`+/**`
	`9`	`+ * @implements \PHPStan\Rules\Rule<Node\Expr\Variable>`
	`10`	`+ */`
`8`	`11`	`class VariableTypeReportingRule implements \PHPStan\Rules\Rule`
`9`	`12`	`{`
`10`	`13`
`@@ -13,11 +16,6 @@ public function getNodeType(): string`
`13`	`16`	`return Node\Expr\Variable::class;`
`14`	`17`	`}`
`15`	`18`
`16`		`- /**`
`17`		`- * @param \PhpParser\Node\Expr\Variable $node`
`18`		`- * @param \PHPStan\Analyser\Scope $scope`
`19`		`- * @return string[] errors`
`20`		`- */`
`21`	`19`	`public function processNode(Node $node, Scope $scope): array`
`22`	`20`	`{`
`23`	`21`	`if (!is_string($node->name)) {`