Try fixing PHP5 comp.

Author: dereuromark

.travis.yml

@@ -21,11 +21,9 @@ matrix:
 before_script:
   - composer install --prefer-dist --no-interaction
 
-  - if [[ $CHECKS != 1 ]]; then composer require --dev phpunit/phpunit:"^5.0|^6.0"; fi
-
 script:
   - if [[ $CHECKS == 1 ]]; then composer phpstan-setup && composer phpstan ; fi
-  - if [[ $CHECKS == 1 ]]; then composer cs-check ; fi
+  - composer cs-check
 
 notifications:
   email: false

PSR2R/Sniffs/Commenting/DocBlockTypeOrderSniff.php

@@ -34,6 +34,11 @@ class DocBlockTypeOrderSniff extends AbstractSniff {
 		'false',
 	];
 
+	/**
+	 * @var string[]
+	 */
+	protected $sortOrder;
+
 	/**
 	 * @inheritDoc
 	 */
@@ -88,7 +93,7 @@ protected function assertOrder(File $phpCsFile, array $docBlockParams) {
 			}
 			$expectedTypes = implode('|', $expectedOrder);
 
-			$fix = $phpCsFile->addFixableError('Nullish/falsely value should be the last element, expected `' . $expectedTypes . '`', $docBlockParam['index'], 'WrongOrder');
+			$fix = $phpCsFile->addFixableError('Nullish/falsely value in `' . $docBlockParam['type'] . '` should be the last element, expected `' . $expectedTypes . '`', $docBlockParam['index'], 'WrongOrder');
 			if (!$fix) {
 				continue;
 			}
@@ -110,29 +115,90 @@ protected function assertOrder(File $phpCsFile, array $docBlockParams) {
 	 * @return string[]
 	 */
 	protected function getExpectedOrder(array $elements) {
-		global $sortOrder;
+		if (version_compare(PHP_VERSION, '7.0') < 0) {
+			return $this->getExpectedOrderLegacy($elements);
+		}
 
 		$sortOrder = array_reverse($this->sortMap);
+		$this->sortOrder = $sortOrder;
+
 		usort($elements, [$this, 'compare']);
 
 		return $elements;
 	}
 
+	/**
+	 * For PHP 5 we need a custom fallback sort.
+	 *
+	 * @param string[] $elements
+	 *
+	 * @return string[]
+	 */
+	protected function getExpectedOrderLegacy(array $elements) {
+		$sortOrder = array_reverse($this->sortMap);
+		$sortOrder = array_flip($sortOrder);
+		foreach ($elements as $element) {
+			if (!isset($sortOrder[$element])) {
+				$sortOrder[$element] = -1;
+			}
+		}
+
+		$array = [];
+		foreach ($elements as $element) {
+			$array[$element] = $sortOrder[$element];
+		}
+
+		static::asort($array);
+
+		$elements = array_keys($array);
+
+		return $elements;
+	}
+
+	/**
+	 * asort() but with a/b of same value to keep existing order.
+	 *
+	 * Required for PHP5, as the order can be inverse here.
+	 *
+	 * @param array $array
+	 * @param int $sortFlags
+	 *
+	 * @return bool
+	 */
+	protected static function asort(array &$array, $sortFlags = SORT_REGULAR) {
+		$index = 0;
+		foreach ($array as &$item) {
+			$item = [$index++, $item];
+		}
+		$result = uasort($array, function($a, $b) use($sortFlags) {
+			if ($a[1] == $b[1]) {
+				return $a[0] - $b[0];
+			}
+			$set = [-1 => $a[1], 1 => $b[1]];
+			asort($set, $sortFlags);
+			reset($set);
+			return key($set);
+		});
+		foreach ($array as &$item) {
+			$item = $item[1];
+		}
+		return $result;
+	}
+
 	/**
 	 * @param string $a
 	 * @param string $b
 	 *
 	 * @return int
 	 */
 	protected function compare($a, $b) {
-		global $sortOrder;
+		$sortOrder = $this->sortOrder;
 
 		$aIndex = array_search($a, $sortOrder, true);
 		$bIndex = array_search($b, $sortOrder, true);
 		if ($aIndex === false) {
 			return -1;
 		}
-
 		if ($bIndex === false) {
 			return 1;
 		}

composer.json

@@ -36,7 +36,7 @@
 		"docs": "php docs/generate.php",
 		"docs-listing": "phpcs -e --standard=PSR2R/ruleset.xml",
 		"cs-check": "phpcs --standard=PSR2R/ruleset.xml -p -s --ignore=/tests/files/,*.inc,*.fixed PSR2R/",
-		"cs-fix": "phpcbf --standard=PSR2R/ruleset.xml --ignore=/tests/files/,*.inc,*.fixed PSR2R/",
+		"cs-fix": "phpcbf --standard=PSR2R/ruleset.xml -p --ignore=/tests/files/,*.inc,*.fixed PSR2R/",
 		"test": "php phpunit.phar",
 		"test-setup": "[ ! -f phpunit.phar ] && wget https://phar.phpunit.de/phpunit-6.5.13.phar && mv phpunit-6.5.13.phar phpunit.phar || true",
 		"test-setup-mac": "[ ! -f phpunit.phar ] && curl -OL https://phar.phpunit.de/phpunit-6.5.13.phar && mv phpunit-6.5.13.phar phpunit.phar || true",