Fix namespace sorting and tests (#185)

Chi-teck · Oct 18, 2024 · 8c9107d · 8c9107d
1 parent 27b41bb
commit 8c9107d
Show file tree

Hide file tree

Showing 36 changed files with 63 additions and 43 deletions.
diff --git a/src/Twig/TwigEnvironment.php b/src/Twig/TwigEnvironment.php
@@ -65,7 +65,7 @@ public function tokenize(Source $source): TokenStream {
   public static function sortNamespaces(string $input): string {
     $lines = \explode(\PHP_EOL, $input);
     $lines = \array_unique($lines);
-    \sort($lines, \SORT_FLAG_CASE | \SORT_NATURAL);
+    \usort($lines, 'strcmp');
     return \trim(\implode(\PHP_EOL, $lines)) . \PHP_EOL;
   }
 

diff --git a/src/Twig/TwigSortSetNode.php b/src/Twig/TwigSortSetNode.php
@@ -25,7 +25,7 @@ public function compile(Compiler $compiler): void {
       ->raw(";\n")
       ->write('$data = explode("\n", $data);' . "\n")
       ->write('$data = array_unique($data);' . "\n")
-      ->write('sort($data, SORT_FLAG_CASE|SORT_NATURAL);' . "\n")
+      ->write('usort($data, "strcmp");' . "\n")
       ->write('yield ltrim(implode("\n", $data)) . "\n";' . "\n");
   }
 

diff --git a/src/Twig/TwigSortTokenParser.php b/src/Twig/TwigSortTokenParser.php
@@ -34,8 +34,8 @@ public function parse(Token $token): Node {
     $ref->setAttribute('always_defined', TRUE);
 
     return new Node([
-      new SetNode(TRUE, $ref, $body, $lineno, $this->getTag()),
-      new TwigSortSetNode(['ref' => $ref], [], $lineno, $this->getTag()),
+      new SetNode(TRUE, $ref, $body, $lineno),
+      new TwigSortSetNode(['ref' => $ref], [], $lineno),
     ]);
   }
 

diff --git a/templates/Plugin/Migrate/_destination/destination.twig b/templates/Plugin/Migrate/_destination/destination.twig
@@ -72,7 +72,7 @@ final class {{ class }} extends DestinationBase {% if services %}implements Cont
   /**
    * {@inheritdoc}
    */
-  public function fields(MigrationInterface $migration = NULL): array {
+  public function fields(?MigrationInterface $migration = NULL): array {
     return [
       'id' => $this->t('The row ID.'),
       // @todo Describe row fields here.

diff --git a/templates/Plugin/_action/action.twig b/templates/Plugin/_action/action.twig
@@ -107,7 +107,7 @@ final class {{ class }} extends {{ configurable ? 'ConfigurableActionBase' : 'Ac
   /**
    * {@inheritdoc}
    */
-  public function access($entity, AccountInterface $account = NULL, $return_as_object = FALSE): AccessResultInterface|bool {
+  public function access($entity, ?AccountInterface $account = NULL, $return_as_object = FALSE): AccessResultInterface|bool {
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $access = $entity->access('update', $account, TRUE)
       ->andIf($entity->get('field_example')->access('edit', $account, TRUE));
@@ -117,7 +117,7 @@ final class {{ class }} extends {{ configurable ? 'ConfigurableActionBase' : 'Ac
   /**
    * {@inheritdoc}
    */
-  public function execute(ContentEntityInterface $entity = NULL): void {
+  public function execute(?ContentEntityInterface $entity = NULL): void {
     $entity->set('field_example', 'New value')->save();
   }
 

diff --git a/templates/Service/_path-processor/path-processor.twig b/templates/Service/_path-processor/path-processor.twig
@@ -42,7 +42,7 @@ final class {{ class }} implements InboundPathProcessorInterface, OutboundPathPr
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL): string {
+  public function processOutbound($path, &$options = [], ?Request $request = NULL, ?BubbleableMetadata $bubbleable_metadata = NULL): string {
     return preg_replace('#^/node/#i', '/content/', $path);
   }
 

diff --git a/...onal/Generator/Plugin/Migrate/_destination/_n_deps/src/Plugin/migrate/destination/Foo.php b/...onal/Generator/Plugin/Migrate/_destination/_n_deps/src/Plugin/migrate/destination/Foo.php
@@ -5,8 +5,8 @@
 namespace Drupal\example\Plugin\migrate\destination;
 
 use Drupal\migrate\Attribute\MigrateDestination;
-use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Drupal\migrate\Row;
 
 /**
@@ -30,7 +30,7 @@ public function getIds(): array {
   /**
    * {@inheritdoc}
    */
-  public function fields(MigrationInterface $migration = NULL): array {
+  public function fields(?MigrationInterface $migration = NULL): array {
     return [
       'id' => $this->t('The row ID.'),
       // @todo Describe row fields here.

diff --git a/...onal/Generator/Plugin/Migrate/_destination/_w_deps/src/Plugin/migrate/destination/Bar.php b/...onal/Generator/Plugin/Migrate/_destination/_w_deps/src/Plugin/migrate/destination/Bar.php
@@ -7,8 +7,8 @@
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\Attribute\MigrateDestination;
-use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -65,7 +65,7 @@ public function getIds(): array {
   /**
    * {@inheritdoc}
    */
-  public function fields(MigrationInterface $migration = NULL): array {
+  public function fields(?MigrationInterface $migration = NULL): array {
     return [
       'id' => $this->t('The row ID.'),
       // @todo Describe row fields here.

diff --git a/tests/functional/Generator/Plugin/_action/_n_deps/_w_config/src/Plugin/Action/Foo.php b/tests/functional/Generator/Plugin/_action/_n_deps/_w_config/src/Plugin/Action/Foo.php
@@ -66,7 +66,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
   /**
    * {@inheritdoc}
    */
-  public function access($entity, AccountInterface $account = NULL, $return_as_object = FALSE): AccessResultInterface|bool {
+  public function access($entity, ?AccountInterface $account = NULL, $return_as_object = FALSE): AccessResultInterface|bool {
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $access = $entity->access('update', $account, TRUE)
       ->andIf($entity->get('field_example')->access('edit', $account, TRUE));
@@ -76,7 +76,7 @@ public function access($entity, AccountInterface $account = NULL, $return_as_obj
   /**
    * {@inheritdoc}
    */
-  public function execute(ContentEntityInterface $entity = NULL): void {
+  public function execute(?ContentEntityInterface $entity = NULL): void {
     $entity->set('field_example', 'New value')->save();
   }
 

diff --git a/tests/functional/Generator/Plugin/_action/_w_deps/_n_config/src/Plugin/Action/Foo.php b/tests/functional/Generator/Plugin/_action/_w_deps/_n_config/src/Plugin/Action/Foo.php
@@ -66,7 +66,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritdoc}
    */
-  public function access($entity, AccountInterface $account = NULL, $return_as_object = FALSE): AccessResultInterface|bool {
+  public function access($entity, ?AccountInterface $account = NULL, $return_as_object = FALSE): AccessResultInterface|bool {
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $access = $entity->access('update', $account, TRUE)
       ->andIf($entity->get('field_example')->access('edit', $account, TRUE));
@@ -76,7 +76,7 @@ public function access($entity, AccountInterface $account = NULL, $return_as_obj
   /**
    * {@inheritdoc}
    */
-  public function execute(ContentEntityInterface $entity = NULL): void {
+  public function execute(?ContentEntityInterface $entity = NULL): void {
     $entity->set('field_example', 'New value')->save();
   }
 

diff --git a/tests/functional/Generator/Service/_logger/_n_deps/src/Logger/ExampleLog.php b/tests/functional/Generator/Service/_logger/_n_deps/src/Logger/ExampleLog.php
@@ -26,6 +26,7 @@ public function __construct(
    * {@inheritdoc}
    */
   public function log($level, string|\Stringable $message, array $context = []): void {
+    $message = (string) $message;
     // Convert PSR3-style messages to \Drupal\Component\Render\FormattableMarkup
     // style, so they can be translated too.
     $placeholders = $this->parser->parseMessagePlaceholders($message, $context);

diff --git a/tests/functional/Generator/Service/_logger/_w_deps/src/Logger/ExampleLog.php b/tests/functional/Generator/Service/_logger/_w_deps/src/Logger/ExampleLog.php
@@ -30,6 +30,7 @@ public function __construct(
    * {@inheritdoc}
    */
   public function log($level, string|\Stringable $message, array $context = []): void {
+    $message = (string) $message;
     // Convert PSR3-style messages to \Drupal\Component\Render\FormattableMarkup
     // style, so they can be translated too.
     $placeholders = $this->parser->parseMessagePlaceholders($message, $context);

diff --git a/...onal/Generator/Service/_path_processor/_n_deps/src/PathProcessor/PathProcessorExample.php b/...onal/Generator/Service/_path_processor/_n_deps/src/PathProcessor/PathProcessorExample.php
@@ -27,7 +27,7 @@ public function processInbound($path, Request $request): string {
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL): string {
+  public function processOutbound($path, &$options = [], ?Request $request = NULL, ?BubbleableMetadata $bubbleable_metadata = NULL): string {
     return preg_replace('#^/node/#i', '/content/', $path);
   }
 

diff --git a/...onal/Generator/Service/_path_processor/_w_deps/src/PathProcessor/PathProcessorExample.php b/...onal/Generator/Service/_path_processor/_w_deps/src/PathProcessor/PathProcessorExample.php
@@ -35,7 +35,7 @@ public function processInbound($path, Request $request): string {
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL): string {
+  public function processOutbound($path, &$options = [], ?Request $request = NULL, ?BubbleableMetadata $bubbleable_metadata = NULL): string {
     return preg_replace('#^/node/#i', '/content/', $path);
   }
 

diff --git a/tests/functional/Generator/_hook/example.module b/tests/functional/Generator/_hook/example.module
@@ -13,13 +13,29 @@ declare(strict_types=1);
 function example_theme($existing, $type, $theme, $path) {
   return [
     'my_module_display' => [
-      'variables' => ['my_modules' => NULL, 'topics' => NULL, 'parents' => NULL, 'tid' => NULL, 'sortby' => NULL, 'my_module_per_page' => NULL],
+      'variables' => [
+        'my_modules' => NULL,
+        'topics' => NULL,
+        'parents' => NULL,
+        'tid' => NULL,
+        'sortby' => NULL,
+        'my_module_per_page' => NULL,
+      ],
     ],
     'my_module_list' => [
-      'variables' => ['my_modules' => NULL, 'parents' => NULL, 'tid' => NULL],
+      'variables' => [
+        'my_modules' => NULL,
+        'parents' => NULL,
+        'tid' => NULL,
+      ],
     ],
     'my_module_icon' => [
-      'variables' => ['new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0],
+      'variables' => [
+        'new_posts' => NULL,
+        'num_posts' => 0,
+        'comment_mode' => 0,
+        'sticky' => 0,
+      ],
     ],
     'status_report' => [
       'render element' => 'requirements',

diff --git a/tests/sut/acme/tests/src/Kernel/BundleClassTest.php b/tests/sut/acme/tests/src/Kernel/BundleClassTest.php
@@ -4,9 +4,9 @@
 
 namespace Drupal\Tests\acme\Kernel;
 
+use Drupal\KernelTests\KernelTestBase;
 use Drupal\acme\Entity\User\UserBase;
 use Drupal\acme\Entity\User\UserBundle;
-use Drupal\KernelTests\KernelTestBase;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/bar/tests/src/Functional/ControllerTest.php b/tests/sut/bar/tests/src/Functional/ControllerTest.php
@@ -4,8 +4,8 @@
 
 namespace Drupal\Tests\bar\Functional;
 
-use Drupal\dcg_test\TestTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\dcg_test\TestTrait;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/bar/tests/src/Functional/FieldTest.php b/tests/sut/bar/tests/src/Functional/FieldTest.php
@@ -6,9 +6,9 @@
 
 use Drupal\Component\Render\FormattableMarkup as FM;
 use Drupal\Core\Datetime\DrupalDateTime;
-use Drupal\dcg_test\TestTrait;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
+use Drupal\dcg_test\TestTrait;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/bar/tests/src/Functional/InstallFileTest.php b/tests/sut/bar/tests/src/Functional/InstallFileTest.php
@@ -4,8 +4,8 @@
 
 namespace Drupal\Tests\bar\Functional;
 
-use Drupal\dcg_test\TestTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\dcg_test\TestTrait;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/bar/tests/src/Kernel/ServiceProviderTest.php b/tests/sut/bar/tests/src/Kernel/ServiceProviderTest.php
@@ -4,10 +4,10 @@
 
 namespace Drupal\Tests\bar\Kernel;
 
-use Drupal\bar\BarServiceProvider;
 use Drupal\Core\DependencyInjection\ServiceModifierInterface;
 use Drupal\Core\DependencyInjection\ServiceProviderInterface;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\bar\BarServiceProvider;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/figma/tests/src/Functional/ContentEntityTest.php b/tests/sut/figma/tests/src/Functional/ContentEntityTest.php
@@ -5,9 +5,9 @@
 namespace Drupal\Tests\figma\Functional;
 
 use Drupal\Component\Render\FormattableMarkup as FM;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\dcg_test\TestTrait;
 use Drupal\figma\Entity\Example;
-use Drupal\Tests\BrowserTestBase;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/foo/tests/src/Functional/FormTest.php b/tests/sut/foo/tests/src/Functional/FormTest.php
@@ -4,8 +4,8 @@
 
 namespace Drupal\Tests\foo\Functional;
 
-use Drupal\dcg_test\TestTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\dcg_test\TestTrait;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/nigma/tests/src/Functional/ContentEntityTest.php b/tests/sut/nigma/tests/src/Functional/ContentEntityTest.php
@@ -5,8 +5,8 @@
 namespace Drupal\Tests\nigma\Functional;
 
 use Drupal\Component\Render\FormattableMarkup as FM;
-use Drupal\dcg_test\TestTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\dcg_test\TestTrait;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/nigma/tests/src/Kernel/AccessHandlerTest.php b/tests/sut/nigma/tests/src/Kernel/AccessHandlerTest.php
@@ -5,8 +5,8 @@
 namespace Drupal\Tests\nigma\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;
-use Drupal\nigma\Entity\Example;
 use Drupal\Tests\user\Traits\UserCreationTrait;
+use Drupal\nigma\Entity\Example;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 

diff --git a/tests/sut/plantain/tests/src/Kernel/BreakpointsTest.php b/tests/sut/plantain/tests/src/Kernel/BreakpointsTest.php
@@ -4,8 +4,8 @@
 
 namespace Drupal\Tests\plantain\Kernel;
 
-use Drupal\breakpoint\Breakpoint;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\breakpoint\Breakpoint;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/qux/tests/src/Functional/BlockTest.php b/tests/sut/qux/tests/src/Functional/BlockTest.php
@@ -4,8 +4,8 @@
 
 namespace Drupal\Tests\qux\Functional;
 
-use Drupal\dcg_test\TestTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\dcg_test\TestTrait;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/qux/tests/src/Functional/FieldTypeTest.php b/tests/sut/qux/tests/src/Functional/FieldTypeTest.php
@@ -5,8 +5,8 @@
 namespace Drupal\Tests\qux\Functional;
 
 use Drupal\Component\Render\FormattableMarkup;
-use Drupal\dcg_test\TestTrait;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\dcg_test\TestTrait;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/qux/tests/src/Kernel/ActionTest.php b/tests/sut/qux/tests/src/Kernel/ActionTest.php
@@ -5,12 +5,12 @@
 namespace Drupal\Tests\qux\Kernel;
 
 use Drupal\Core\Access\AccessResultInterface;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\KernelTests\KernelTestBase;
-use Drupal\node\NodeTypeInterface;
 use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\node\NodeTypeInterface;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/qux/tests/src/Kernel/FilterTest.php b/tests/sut/qux/tests/src/Kernel/FilterTest.php
@@ -5,8 +5,8 @@
 namespace Drupal\Tests\qux\Kernel;
 
 use Drupal\Core\Form\FormState;
-use Drupal\filter\FilterPluginCollection;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\filter\FilterPluginCollection;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/qux/tests/src/Kernel/ViewStyleTest.php b/tests/sut/qux/tests/src/Kernel/ViewStyleTest.php
@@ -66,7 +66,7 @@ protected function assertWrapperClass(string $wrapper_class): void {
     $build = \views_embed_view('qux_example');
     $output = $this->container->get('renderer')->renderRoot($build);
     $xml = new \SimpleXMLElement((string) $output);
-    $xpath = \sprintf('//div/div[@class = "%s"]/div//a[text() = "Hello world!"]', $wrapper_class);
+    $xpath = \sprintf('//div/div[@class = "%s"]/div//span[text() = "Hello world!"]', $wrapper_class);
     self::assertCount(1, $xml->xpath($xpath));
   }
 

diff --git a/tests/sut/sigma/tests/src/Functional/ContentEntityTest.php b/tests/sut/sigma/tests/src/Functional/ContentEntityTest.php
@@ -5,9 +5,9 @@
 namespace Drupal\Tests\sigma\Functional;
 
 use Drupal\Component\Render\FormattableMarkup as FM;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\dcg_test\TestTrait;
 use Drupal\sigma\Entity\Example;
-use Drupal\Tests\BrowserTestBase;
 use PHPUnit\Framework\Attributes\Group;
 
 /**

diff --git a/tests/sut/sonata/tests/src/Unit/ExampleCommandTest.php b/tests/sut/sonata/tests/src/Unit/ExampleCommandTest.php
@@ -5,8 +5,8 @@
 namespace Drupal\Tests\sonata\Unit;
 
 use Composer\Console\Application;
-use Drupal\sonata\Command\ExampleCommand;
 use Drupal\Tests\UnitTestCase;
+use Drupal\sonata\Command\ExampleCommand;
 use PHPUnit\Framework\Attributes\Group;
 use Symfony\Component\Console\Tester\CommandTester;
 

diff --git a/tests/sut/tandoor/tests/src/Kernel/BreakpointsTest.php b/tests/sut/tandoor/tests/src/Kernel/BreakpointsTest.php
@@ -4,8 +4,8 @@
 
 namespace Drupal\Tests\tandoor\Kernel;
 
-use Drupal\breakpoint\Breakpoint;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\breakpoint\Breakpoint;
 use PHPUnit\Framework\Attributes\Group;
 
 /**