Merge master.

Author: dereuromark

.editorconfig

@@ -16,3 +16,6 @@ end_of_line = crlf
 [*.yml]
 indent_style = space
 indent_size = 2
+
+[*.neon]
+indent_style = space

.gitignore

@@ -1,7 +1,7 @@
 /vendor/*
 /phpunit.phar
+.phpunit.result.cache
 /composer.phar
 /composer.lock
-/.idea
+.idea
 clover.xml
-/composer.lock

.travis.yml

@@ -3,28 +3,31 @@ language: php
 sudo: false
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
+  - 7.3
+  - 7.4snapshot
+
+env:
+  global:
+    - CHECKS=1
 
 matrix:
   include:
-    - php: 7.0
-      env: PHPCS=1 DEFAULT=0
+    - php: 7.2
+      env: CHECKS=1 DEFAULT=0
 
   fast_finish: true
 
 before_script:
-  - composer self-update
   - composer install --prefer-dist --no-interaction
 
-script:
-  - sh -c "if [ '$DEFAULT' = '1' ]; then phpunit; fi"
+  - if [[ $CHECKS != 1 ]]; then composer require --dev phpunit/phpunit:"^6.0"; fi
 
-  - sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --coverage-clover build/logs/clover.xml; fi"
-  - sh -c "if [ '$COVERALLS' = '1' ]; then vendor/bin/coveralls -c .coveralls.yml -v; fi"
+script:
+  - if [[ $DEFAULT == 1 ]]; then vendor/bin/phpunit; fi
 
-  - sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=PSR2R/ruleset.xml --ignore=vendor/,tests/files/,*.inc,*.fixed . ; fi"
+  - if [[ $CHECKS == 1 ]]; then composer phpstan-setup && composer phpstan ; fi
+  - if [[ $CHECKS == 1 ]]; then composer cs-check ; fi
 
 notifications:
   email: false

PSR2R/Sniffs/Commenting/DocBlockEndingSniff.php

@@ -14,6 +14,13 @@
  */
 class DocBlockEndingSniff implements Sniff {
 
+	/**
+	 * @inheritDoc
+	 */
+	public function register() {
+		return Tokens::$commentTokens;
+	}
+
 	/**
 	 * @inheritDoc
 	 */
@@ -65,7 +72,7 @@ public function process(File $phpcsFile, $stackPtr) {
 		foreach ($comments as $commentPointer) {
 			// Check the spacing after each asterisk.
 			$content = $tokens[$commentPointer]['content'];
-			/* @noinspection SubStrUsedAsArrayAccessInspection */
+			/** @noinspection SubStrUsedAsArrayAccessInspection */
 			$firstChar = substr($content, 0, 1);
 			$lastChar = substr($content, -1);
 			if ($firstChar === '/' || $lastChar !== '/') {
@@ -88,11 +95,4 @@ public function process(File $phpcsFile, $stackPtr) {
 		}
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function register() {
-		return Tokens::$commentTokens;
-	}
-
 }

PSR2R/Sniffs/Commenting/DocBlockParamAllowDefaultValueSniff.php

@@ -19,6 +19,15 @@ class DocBlockParamAllowDefaultValueSniff extends AbstractSniff {
 	use CommentingTrait;
 	use SignatureTrait;
 
+	/**
+	 * @inheritDoc
+	 */
+	public function register() {
+		return [
+			T_FUNCTION,
+		];
+	}
+
 	/**
 	 * @inheritDoc
 	 */
@@ -111,13 +120,4 @@ public function process(File $phpCsFile, $stackPointer) {
 		}
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function register() {
-		return [
-			T_FUNCTION,
-		];
-	}
-
 }

PSR2R/Sniffs/Commenting/DocBlockParamArraySniff.php

@@ -17,6 +17,15 @@ class DocBlockParamArraySniff extends AbstractSniff {
 
 	use CommentingTrait;
 
+	/**
+	 * @inheritDoc
+	 */
+	public function register() {
+		return [
+			T_FUNCTION,
+		];
+	}
+
 	/**
 	 * @inheritDoc
 	 */
@@ -86,13 +95,4 @@ public function process(File $phpCsFile, $stackPointer) {
 		}
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function register() {
-		return [
-			T_FUNCTION,
-		];
-	}
-
 }

PSR2R/Sniffs/Commenting/DocBlockParamNoOpSniff.php

@@ -13,6 +13,15 @@
  */
 class DocBlockParamNoOpSniff extends AbstractSniff {
 
+	/**
+	 * @inheritDoc
+	 */
+	public function register() {
+		return [
+			T_FUNCTION,
+		];
+	}
+
 	/**
 	 * @inheritDoc
 	 */
@@ -61,13 +70,4 @@ public function process(File $phpCsFile, $stackPointer) {
 		}
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function register() {
-		return [
-			T_FUNCTION,
-		];
-	}
-
 }

PSR2R/Sniffs/Commenting/DocBlockParamNotJustNullSniff.php

@@ -18,6 +18,15 @@ class DocBlockParamNotJustNullSniff extends AbstractSniff {
 	use CommentingTrait;
 	use SignatureTrait;
 
+	/**
+	 * @inheritDoc
+	 */
+	public function register() {
+		return [
+			T_FUNCTION,
+		];
+	}
+
 	/**
 	 * @inheritDoc
 	 */
@@ -72,13 +81,4 @@ public function process(File $phpCsFile, $stackPointer) {
 		}
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function register() {
-		return [
-			T_FUNCTION,
-		];
-	}
-
 }

PSR2R/Sniffs/Commenting/DocBlockParamSniff.php

@@ -18,6 +18,15 @@ class DocBlockParamSniff extends AbstractSniff {
 	use CommentingTrait;
 	use SignatureTrait;
 
+	/**
+	 * @inheritDoc
+	 */
+	public function register() {
+		return [
+			T_FUNCTION,
+		];
+	}
+
 	/**
 	 * @inheritDoc
 	 */
@@ -66,7 +75,7 @@ public function process(File $phpCsFile, $stackPointer) {
 				$content = substr($content, 0, $spacePos);
 			}
 
-			/* @noinspection NotOptimalRegularExpressionsInspection */
+			/** @noinspection NotOptimalRegularExpressionsInspection */
 			preg_match('/\$[^\s]+/', $appendix, $matches);
 			$variable = $matches ? $matches[0] : '';
 
@@ -115,15 +124,6 @@ public function process(File $phpCsFile, $stackPointer) {
 		}
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function register() {
-		return [
-			T_FUNCTION,
-		];
-	}
-
 	/**
 	 * //TODO: Replace with SignatureTrait
 	 *

PSR2R/Sniffs/Commenting/DocBlockPipeSpacingSniff.php

@@ -13,36 +13,57 @@
  */
 class DocBlockPipeSpacingSniff extends AbstractSniff {
 
+	/**
+	 * @inheritDoc
+	 */
+	public function register() {
+		return [
+			T_DOC_COMMENT_STRING,
+		];
+	}
+
 	/**
 	 * @inheritDoc
 	 */
 	public function process(File $phpcsFile, $stackPtr) {
 		$tokens = $phpcsFile->getTokens();
 
 		$content = $tokens[$stackPtr]['content'];
-		if (substr_count($content, '|') !== 1) {
+		$isInlineDocBlock = substr($content, -1, 1) === ' ';
+
+		// Fix inline doc blocks
+		$appendix = '';
+		$varIndex = strpos($content, '$');
+		if ($varIndex) {
+			$appendix = substr($content, $varIndex);
+			$content = substr($content, 0, $varIndex);
+		}
+
+		if (strpos($content, '|') === false) {
 			return;
 		}
 
-		list($left, $right) = explode('|', $content);
-		$newContent = trim($left) . '|' . trim($right);
+		$pieces = explode('|', $content);
+		$newContent = [];
+		foreach ($pieces as $piece) {
+			$newContent[] = trim($piece);
+		}
+		$newContent = implode('|', $newContent);
 
-		if ($newContent !== $content) {
+		if (trim($newContent) !== trim($content)) {
 			$fix = $phpcsFile->addFixableError('There should be no space around pipes in doc blocks.', $stackPtr,
 				'PipeSpacing');
 			if ($fix) {
-				$phpcsFile->fixer->replaceToken($stackPtr, $newContent);
+				if ($appendix) {
+					$appendix = ' ' . $appendix;
+				}
+				if ($isInlineDocBlock) {
+					$appendix .= ' ';
+				}
+
+				$phpcsFile->fixer->replaceToken($stackPtr, $newContent . $appendix);
 			}
 		}
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function register() {
-		return [
-			T_DOC_COMMENT_STRING,
-		];
-	}
-
 }