Merge pull request #1772 from WordPress/feature/php-7.4-compatibility

PHP 7.4 compatibility / defensive coding
WordPress · Jul 25, 2019 · 6aab357 · 6aab357
2 parents 89c2154 + 5fe9561
commit 6aab357
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/WordPress/Sniff.php b/WordPress/Sniff.php
@@ -1339,6 +1339,10 @@ protected function is_test_class( $stackPtr ) {
 
 		// Does the class/trait extend one of the whitelisted test classes ?
 		$extendedClassName = $this->phpcsFile->findExtendedClassName( $stackPtr );
+		if ( false === $extendedClassName ) {
+			return false;
+		}
+
 		if ( '\\' === $extendedClassName[0] ) {
 			if ( isset( $whitelist[ substr( $extendedClassName, 1 ) ] ) ) {
 				return true;
@@ -1481,8 +1485,8 @@ protected function has_nonce_check( $stackPtr ) {
 		// Check if we've looked here before.
 		$filename = $this->phpcsFile->getFilename();
 
-		if (
-			$filename === $last['file']
+		if ( is_array( $last )
+			&& $filename === $last['file']
 			&& $start === $last['start']
 		) {