Drupal.WhiteSpace.ScopeIndent gets confused by attributes on a function.

Problem/Motivation

Save this as broken.php and run ./vendor/bin/phpcs --standard=core/phpcs.xml.dist --sniffs=Drupal.WhiteSpace.ScopeIndent broken.php:

<?php

#[X]
 public function test() {
 }

Observe no errors.

Save this one as correct.php and run ./vendor/bin/phpcs --standard=core/phpcs.xml.dist --sniffs=Drupal.WhiteSpace.ScopeIndent correct.php

<?php
# [X]
 public function test() {
 }

The only change is I changed the attribute to be a comment. Observe two fixable errors found.

Proposed resolution

                if ($tokenIndent > $checkIndent) {
                    // Ignore multi line statements.
                    $before = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($checkToken - 1), null, true);
                    if ($before !== false && in_array(
                        $tokens[$before]['code'],
                        [
                            T_SEMICOLON,
                            T_CLOSE_CURLY_BRACKET,
                            T_OPEN_CURLY_BRACKET,
                            T_COLON,
                            T_OPEN_TAG,
                            T_ATTRIBUTE_END
                        ]
                    ) === false
                    ) {
                        continue;
                    }
                }

Remaining tasks

This works great at fixing indentation for attributes on methods.
This breaks stories attributes (7 in core) ul add examples later.

  public function __construct(
    Settings $settings,
    #[AutowireLocator('queue_factory')]
  protected ContainerInterface $container,
  ) {/lib

User interface changes

API changes

Data model changes