diff --git a/src/Files/File.php b/src/Files/File.php index aabafd46b5..6b8379d1ac 100644 --- a/src/Files/File.php +++ b/src/Files/File.php @@ -346,7 +346,6 @@ public function process() $listenerIgnoreTo = []; $inTests = defined('PHP_CODESNIFFER_IN_TESTS'); $checkAnnotations = $this->config->annotations; - $annotationErrors = []; // Foreach of the listeners that have registered to listen for this // token, get them to process it. @@ -415,15 +414,7 @@ public function process() 'scope' => 'sniff', ]; $listenerClass = $this->ruleset->sniffCodes[$listenerCode]; - try { - $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $settings); - } catch (RuntimeException $e) { - // Non-existant property being set via an inline annotation. - // This is typically a PHPCS test case file, but we can't throw an error on the annotation - // line as it would get ignored. We also don't want this error to block - // the scan of the current file, so collect these and throw later. - $annotationErrors[] = 'Line '.$token['line'].': '.str_replace('Ruleset invalid. ', '', $e->getMessage()); - } + $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $settings); } } }//end if @@ -553,13 +544,6 @@ public function process() } } - if ($annotationErrors !== []) { - $error = 'Encountered invalid inline phpcs:set annotations. Found:'.PHP_EOL; - $error .= implode(PHP_EOL, $annotationErrors); - - $this->addWarning($error, null, 'Internal.PropertyDoesNotExist'); - } - if (PHP_CODESNIFFER_VERBOSITY > 2) { echo "\t*** END TOKEN PROCESSING ***".PHP_EOL; echo "\t*** START SNIFF PROCESSING REPORT ***".PHP_EOL; diff --git a/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.inc b/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.inc index e2ca72d1f1..3355c2d32c 100644 --- a/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.inc +++ b/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.inc @@ -1,9 +1,2 @@ 2, - 9 => 2, ]; }//end getErrorList() @@ -48,7 +47,6 @@ public function getErrorList() */ public function getWarningList() { - // Warning about incorrect annotation will be shown on line 1 once PR #3915 would be merged. return []; }//end getWarningList()