Merge branch 'develop'

* develop:
  -
  Fix `OrderedUseStatements` when `use function` is used (#2029)
  Add testcase

Author: OskarStark

src/Rule/OrderedUseStatements.php

@@ -99,6 +99,7 @@ private function extractClass(string $useStatement): string
             ->trim()
             ->replace('\\', 'A') // the "A" here helps to sort !!
             ->lower()
+            ->replace('function ', 'zzzfunction') // prefix with "zzz" to sort functions at the end
             ->toString();
     }
 }

tests/Rule/OrderedUseStatementsTest.php

@@ -267,6 +267,62 @@ public function doSomething()
     }
 RST;
 
+        $valid_with_function = <<<'RST'
+for that::
+
+    use Symfony\Component\Form\AbstractType;
+    use function Symfony\foo;
+RST;
+
+        $valid3 = <<<'RST'
+and storage::
+
+    // src/Security/NormalizedUserBadge.php
+    namespace App\Security;
+
+    use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
+    use function Symfony\Component\String\u;
+
+    final class NormalizedUserBadge extends UserBadge
+    {
+        public function __construct(string $identifier)
+        {
+            $callback = static fn (string $identifier): string => u($identifier)->normalize(UnicodeString::NFKC)->ascii()->lower()->toString();
+
+            parent::__construct($identifier, null, $callback);
+        }
+    }
+
+::
+
+    // src/Security/PasswordAuthenticator.php
+    namespace App\Security;
+
+    final class PasswordAuthenticator extends AbstractLoginFormAuthenticator
+    {
+        // simplified for brevity
+        public function authenticate(Request $request): Passport
+        {
+            $username = (string) $request->request->get('username', '');
+            $password = (string) $request->request->get('password', '');
+
+            $request->getSession()
+                ->set(SecurityRequestAttributes::LAST_USERNAME, $username);
+
+            return new Passport(
+                new NormalizedUserBadge($username),
+                new PasswordCredentials($password),
+                [
+                    // all other useful badges
+                ]
+            );
+        }
+    }
+
+User Credential
+~~~~~~~~~~~~~~~
+RST;
+
         yield 'valid with trait' => [
             NullViolation::create(),
             new RstSample($valid_with_trait, 1),
@@ -299,5 +355,13 @@ public function doSomething()
             NullViolation::create(),
             new RstSample($valid_in_trait_definition, 1),
         ];
+        yield 'valid with function' => [
+            NullViolation::create(),
+            new RstSample($valid_with_function, 1),
+        ];
+        yield 'valid 3' => [
+            NullViolation::create(),
+            new RstSample($valid3),
+        ];
     }
 }