Updated dependencies

Author: kukulich

SlevomatCodingStandard/Helpers/TokenHelper.php

@@ -50,11 +50,9 @@ class TokenHelper
 	 */
 	public static function findNext(\PHP_CodeSniffer_File $phpcsFile, $types, int $startPointer, int $endPointer = null)
 	{
+		/** @var int|false $token */
 		$token = $phpcsFile->findNext($types, $startPointer, $endPointer, false);
-		if ($token === false) {
-			return null;
-		}
-		return $token;
+		return $token === false ? null : $token;
 	}
 
 	/**
@@ -67,11 +65,9 @@ public static function findNext(\PHP_CodeSniffer_File $phpcsFile, $types, int $s
 	 */
 	public static function findNextContent(\PHP_CodeSniffer_File $phpcsFile, $types, string $content, int $startPointer, int $endPointer = null)
 	{
+		/** @var int|false $token */
 		$token = $phpcsFile->findNext($types, $startPointer, $endPointer, false, $content);
-		if ($token === false) {
-			return null;
-		}
-		return $token;
+		return $token === false ? null : $token;
 	}
 
 	/**
@@ -94,11 +90,9 @@ public static function findNextEffective(\PHP_CodeSniffer_File $phpcsFile, int $
 	 */
 	public static function findNextExcluding(\PHP_CodeSniffer_File $phpcsFile, $types, int $startPointer, int $endPointer = null)
 	{
+		/** @var int|false $token */
 		$token = $phpcsFile->findNext($types, $startPointer, $endPointer, true);
-		if ($token === false) {
-			return null;
-		}
-		return $token;
+		return $token === false ? null : $token;
 	}
 
 	/**
@@ -110,11 +104,9 @@ public static function findNextExcluding(\PHP_CodeSniffer_File $phpcsFile, $type
 	 */
 	public static function findNextLocal(\PHP_CodeSniffer_File $phpcsFile, $types, int $startPointer, int $endPointer = null)
 	{
+		/** @var int|false $token */
 		$token = $phpcsFile->findNext($types, $startPointer, $endPointer, false, null, true);
-		if ($token === false) {
-			return null;
-		}
-		return $token;
+		return $token === false ? null : $token;
 	}
 
 	/**
@@ -126,11 +118,9 @@ public static function findNextLocal(\PHP_CodeSniffer_File $phpcsFile, $types, i
 	 */
 	public static function findNextLocalExcluding(\PHP_CodeSniffer_File $phpcsFile, $types, int $startPointer, int $endPointer = null)
 	{
+		/** @var int|false $token */
 		$token = $phpcsFile->findNext($types, $startPointer, $endPointer, true, null, true);
-		if ($token === false) {
-			return null;
-		}
-		return $token;
+		return $token === false ? null : $token;
 	}
 
 	/**
@@ -153,11 +143,9 @@ public static function findNextAnyToken(\PHP_CodeSniffer_File $phpcsFile, int $s
 	 */
 	public static function findPrevious(\PHP_CodeSniffer_File $phpcsFile, $types, int $startPointer, int $endPointer = null)
 	{
+		/** @var int|false $token */
 		$token = $phpcsFile->findPrevious($types, $startPointer, $endPointer, false);
-		if ($token === false) {
-			return null;
-		}
-		return $token;
+		return $token === false ? null : $token;
 	}
 
 	/**
@@ -180,11 +168,9 @@ public static function findPreviousEffective(\PHP_CodeSniffer_File $phpcsFile, i
 	 */
 	public static function findPreviousExcluding(\PHP_CodeSniffer_File $phpcsFile, $types, int $startPointer, int $endPointer = null)
 	{
+		/** @var int|false $token */
 		$token = $phpcsFile->findPrevious($types, $startPointer, $endPointer, true);
-		if ($token === false) {
-			return null;
-		}
-		return $token;
+		return $token === false ? null : $token;
 	}
 
 	/**

build.xml

@@ -90,7 +90,7 @@
 		>
 			<arg value="analyse"/>
 			<arg value="-l"/>
-			<arg value="5"/>
+			<arg value="6"/>
 			<arg value="-c"/>
 			<arg path="build/phpstan.neon"/>
 			<arg path="SlevomatCodingStandard"/>

build/phpstan.neon

@@ -1,4 +1,7 @@
 parameters:
+	autoload_files:
+		- %currentWorkingDirectory%/vendor/squizlabs/php_codesniffer/CodeSniffer/Tokens.php
 	excludes_analyse:
 		- */tests/*/data/*
-	enableUnionTypes: false
+	ignoreErrors:
+		- '~Parameter #2 \$array of method PHPUnit\\Framework\\Assert::assertArrayHasKey\(\)~'

composer.json

@@ -14,8 +14,8 @@
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "0.9.2",
 		"phing/phing": "2.16",
-		"phpstan/phpstan": "0.6.4",
-		"phpunit/phpunit": "6.1.2"
+		"phpstan/phpstan": "0.7.0",
+		"phpunit/phpunit": "6.2.2"
 	},
 	"autoload": {
 		"psr-4": {