diff --git a/.travis.yml b/.travis.yml index cbb484d..170ca9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ php: - 7.1 - 7.2 - 7.3 + - 7.4 env: - dependencies=lowest - dependencies=highest diff --git a/composer.json b/composer.json index fa2e1ee..03b8696 100644 --- a/composer.json +++ b/composer.json @@ -10,15 +10,15 @@ "phpstan/phpstan": "^0.12.40" }, "require-dev": { - "consistence/coding-standard": "^3.7", + "consistence/coding-standard": "^3.10", "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "ergebnis/composer-normalize": "^2.0.2", - "jakub-onderka/php-parallel-lint": "^1.0", - "phing/phing": "^2.16.0", + "phing/phing": "^2.16.2", + "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.1", "phpunit/phpunit": "^7.5.18", - "slevomat/coding-standard": "^4.5.2", + "slevomat/coding-standard": "^6.4", "webmozart/assert": "^1.7.0" }, "config": { diff --git a/phpcs.xml b/phpcs.xml index aac1218..54b22d4 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -17,7 +17,7 @@ - + + + + + + + + + + + + + - + diff --git a/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php b/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php index ee0feca..abd5da9 100644 --- a/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php +++ b/src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php @@ -403,7 +403,9 @@ function (Type $type): Type { return TypeCombinator::removeNull($type); } ); - } elseif ($methodName === 'allNotInstanceOf') { + } + + if ($methodName === 'allNotInstanceOf') { $classType = $scope->getType($node->args[1]->value); if (!$classType instanceof ConstantStringType) { return new SpecifiedTypes([], []); @@ -417,7 +419,9 @@ function (Type $type) use ($objectType): Type { return TypeCombinator::remove($type, $objectType); } ); - } elseif ($methodName === 'allNotSame') { + } + + if ($methodName === 'allNotSame') { $valueType = $scope->getType($node->args[1]->value); return $this->arrayOrIterable( $scope,