Merge branch '8.3.x' into 3516489-phpstan-ignore

Author: jonathan1055

coder_sniffer/Drupal/Sniffs/Commenting/DocCommentSniff.php

@@ -370,6 +370,7 @@ public function process(File $phpcsFile, $stackPtr)
         if ($tokens[$firstTag]['line'] !== ($tokens[$prev]['line'] + 2)
             && isset($fileShort) === false
             && in_array($tokens[$firstTag]['content'], ['@code', '@link', '@endlink']) === false
+            && isset(Tokens::$phpcsCommentTokens[$tokens[$prev]['code']]) === false
         ) {
             $error = 'There must be exactly one blank line before the tags in a doc comment';
             $fix   = $phpcsFile->addFixableError($error, $firstTag, 'SpacingBeforeTags');

tests/Drupal/good/good.php

@@ -1987,6 +1987,23 @@ protected function getFallbackPluginId($plugin_id, array $configuration = []) {
 
 }
 
+/**
+ * Provides a collection of condition plugins.
+ */
+class ConditionPluginCollection extends DefaultLazyPluginCollection {
+
+  /**
+   * {@inheritdoc}
+   *
+   * phpcs:ignore Drupal.Commenting.FunctionComment.MissingReturnComment
+   * @return \Drupal\Core\Condition\ConditionInterface
+   */
+  public function &get($instance_id) {
+    return 'x';
+  }
+
+}
+
 /**
  * Test for @phpstan-ignore-next-line.
  *