From 17a057c4ea95a99481472f37510f9b8802a0eebd Mon Sep 17 00:00:00 2001
From: Liam Morland <liam@openplus.ca>
Date: Wed, 6 Mar 2024 11:23:01 -0500
Subject: [PATCH] Issue #3426100: Sort 'use' statements
---
fillpdf.install | 6 +++---
fillpdf.module | 2 +-
src/Entity/FillPdfFileContext.php | 4 ++--
src/FillPdfAccessController.php | 6 +++---
src/FillPdfFileContextAccessControlHandler.php | 2 +-
src/FillPdfFormAccessControlHandler.php | 2 +-
src/Form/FillPdfOverviewForm.php | 4 ++--
src/OutputHandler.php | 2 +-
src/Plugin/FillPdfActionPluginInterface.php | 2 +-
src/Plugin/PdfBackend/LocalServerPdfBackend.php | 4 ++--
src/Service/FillPdfAdminFormHelper.php | 4 ++--
src/TokenResolver.php | 2 +-
tests/src/Functional/FillPdfFormDeleteFormTest.php | 2 +-
tests/src/Functional/FillPdfFormDuplicateFormTest.php | 2 +-
tests/src/Functional/FillPdfFormImportFormTest.php | 2 +-
tests/src/Functional/FillPdfOverviewFormTest.php | 4 ++--
tests/src/Functional/FillPdfUploadTestBase.php | 2 +-
tests/src/Functional/PdfParseTest.php | 2 +-
tests/src/Functional/UninstallTest.php | 2 +-
19 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/fillpdf.install b/fillpdf.install
index b009b59..37d6566 100644
--- a/fillpdf.install
+++ b/fillpdf.install
@@ -5,15 +5,15 @@
* Install functions for FillPDF.
*/
+use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Link;
use Drupal\Core\StreamWrapper\StreamWrapperInterface;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\Url;
use Drupal\fillpdf\Entity\FillPdfForm;
use Drupal\fillpdf\Plugin\PdfBackend\PdftkPdfBackend;
use Drupal\fillpdf\Service\FillPdfAdminFormHelper;
-use Drupal\Core\Link;
-use Drupal\Core\Url;
/**
* Implements hook_update_N().
diff --git a/fillpdf.module b/fillpdf.module
index b0cd7e5..30d9cf8 100644
--- a/fillpdf.module
+++ b/fillpdf.module
@@ -5,8 +5,8 @@
* Allows mappings of PDFs to site content.
*/
-use Drupal\Core\Url;
use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
/**
* Implements hook_help().
diff --git a/src/Entity/FillPdfFileContext.php b/src/Entity/FillPdfFileContext.php
index eda8a02..dbb8b13 100644
--- a/src/Entity/FillPdfFileContext.php
+++ b/src/Entity/FillPdfFileContext.php
@@ -2,10 +2,10 @@
namespace Drupal\fillpdf\Entity;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\Entity\ContentEntityBase;
+use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\fillpdf\FillPdfFileContextInterface;
/**
diff --git a/src/FillPdfAccessController.php b/src/FillPdfAccessController.php
index a5ff1bd..07769ec 100644
--- a/src/FillPdfAccessController.php
+++ b/src/FillPdfAccessController.php
@@ -4,12 +4,12 @@ namespace Drupal\fillpdf;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
use Drupal\Core\Logger\LoggerChannelTrait;
use Drupal\Core\Messenger\MessengerTrait;
use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
/**
* Defines a custom access controller for the FillPDF generation route.
diff --git a/src/FillPdfFileContextAccessControlHandler.php b/src/FillPdfFileContextAccessControlHandler.php
index e91bece..e21943c 100644
--- a/src/FillPdfFileContextAccessControlHandler.php
+++ b/src/FillPdfFileContextAccessControlHandler.php
@@ -2,12 +2,12 @@
namespace Drupal\fillpdf;
+use Drupal\Core\Access\AccessResult;
use Drupal\Core\Entity\EntityAccessControlHandler;
use Drupal\Core\Entity\EntityHandlerInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Access\AccessResult;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
diff --git a/src/FillPdfFormAccessControlHandler.php b/src/FillPdfFormAccessControlHandler.php
index 36d849a..daaa2ad 100644
--- a/src/FillPdfFormAccessControlHandler.php
+++ b/src/FillPdfFormAccessControlHandler.php
@@ -2,10 +2,10 @@
namespace Drupal\fillpdf;
+use Drupal\Core\Access\AccessResult;
use Drupal\Core\Entity\EntityAccessControlHandler;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Access\AccessResult;
/**
* Access controller for the FillPDF form entity.
diff --git a/src/Form/FillPdfOverviewForm.php b/src/Form/FillPdfOverviewForm.php
index 5fa43b4..c09d371 100644
--- a/src/Form/FillPdfOverviewForm.php
+++ b/src/Form/FillPdfOverviewForm.php
@@ -8,12 +8,12 @@ use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
use Drupal\Core\Url;
-use Drupal\fillpdf\InputHelperInterface;
use Drupal\fillpdf\Component\Utility\FillPdf;
+use Drupal\fillpdf\InputHelperInterface;
use Drupal\fillpdf\Plugin\PdfBackendManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Link;
/**
* FillPDF overview form.
diff --git a/src/OutputHandler.php b/src/OutputHandler.php
index 826fc86..60d22e7 100644
--- a/src/OutputHandler.php
+++ b/src/OutputHandler.php
@@ -2,13 +2,13 @@
namespace Drupal\fillpdf;
+use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\file\FileInterface;
use Drupal\file\FileRepositoryInterface;
use Drupal\fillpdf\Component\Utility\FillPdf;
use Drupal\fillpdf\Entity\FillPdfFileContext;
use Psr\Log\LoggerInterface;
-use Drupal\Core\File\FileSystemInterface;
/**
* {@inheritdoc}
diff --git a/src/Plugin/FillPdfActionPluginInterface.php b/src/Plugin/FillPdfActionPluginInterface.php
index d693702..2c30cdd 100644
--- a/src/Plugin/FillPdfActionPluginInterface.php
+++ b/src/Plugin/FillPdfActionPluginInterface.php
@@ -4,8 +4,8 @@ namespace Drupal\fillpdf\Plugin;
use Drupal\Component\Plugin\DependentPluginInterface;
use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Executable\ExecutableInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
/**
* Defines an interface for FillPDF action plugins.
diff --git a/src/Plugin/PdfBackend/LocalServerPdfBackend.php b/src/Plugin/PdfBackend/LocalServerPdfBackend.php
index 3882c84..764cdb8 100644
--- a/src/Plugin/PdfBackend/LocalServerPdfBackend.php
+++ b/src/Plugin/PdfBackend/LocalServerPdfBackend.php
@@ -2,8 +2,6 @@
namespace Drupal\fillpdf\Plugin\PdfBackend;
-use function GuzzleHttp\json_encode;
-use function GuzzleHttp\json_decode;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\file\FileInterface;
use Drupal\fillpdf\FieldMapping\ImageFieldMapping;
@@ -12,6 +10,8 @@ use Drupal\fillpdf\Plugin\PdfBackendBase;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\RequestException;
use Symfony\Component\DependencyInjection\ContainerInterface;
+use function GuzzleHttp\json_decode;
+use function GuzzleHttp\json_encode;
/**
* LocalServer PdfBackend plugin.
diff --git a/src/Service/FillPdfAdminFormHelper.php b/src/Service/FillPdfAdminFormHelper.php
index 98c37ea..0736c6a 100644
--- a/src/Service/FillPdfAdminFormHelper.php
+++ b/src/Service/FillPdfAdminFormHelper.php
@@ -2,14 +2,14 @@
namespace Drupal\fillpdf\Service;
+use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Database\Connection;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\StreamWrapper\StreamWrapperInterface;
use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
-use Drupal\fillpdf\FillPdfAdminFormHelperInterface;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\fillpdf\FillPdfAdminFormHelperInterface;
/**
* Various helper methods used in FillPDF administrative forms.
diff --git a/src/TokenResolver.php b/src/TokenResolver.php
index 283accd..815384e 100644
--- a/src/TokenResolver.php
+++ b/src/TokenResolver.php
@@ -9,9 +9,9 @@ use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Render\BubbleableMetadata;
use Drupal\Core\Utility\Token;
use Drupal\file\Entity\File;
-use Drupal\image\Plugin\Field\FieldType\ImageItem;
use Drupal\fillpdf\FieldMapping\ImageFieldMapping;
use Drupal\fillpdf\FieldMapping\TextFieldMapping;
+use Drupal\image\Plugin\Field\FieldType\ImageItem;
use Drupal\token\TokenEntityMapperInterface;
/**
diff --git a/tests/src/Functional/FillPdfFormDeleteFormTest.php b/tests/src/Functional/FillPdfFormDeleteFormTest.php
index af2a9bf..14772c3 100644
--- a/tests/src/Functional/FillPdfFormDeleteFormTest.php
+++ b/tests/src/Functional/FillPdfFormDeleteFormTest.php
@@ -2,11 +2,11 @@
namespace Drupal\Tests\fillpdf\Functional;
+use Drupal\Core\Url;
use Drupal\fillpdf\Entity\FillPdfForm;
use Drupal\fillpdf\Entity\FillPdfFormField;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\fillpdf\Traits\TestFillPdfTrait;
-use Drupal\Core\Url;
/**
* @coversDefaultClass \Drupal\fillpdf\Form\FillPdfFormDeleteForm
diff --git a/tests/src/Functional/FillPdfFormDuplicateFormTest.php b/tests/src/Functional/FillPdfFormDuplicateFormTest.php
index 9863531..9f2a3a9 100644
--- a/tests/src/Functional/FillPdfFormDuplicateFormTest.php
+++ b/tests/src/Functional/FillPdfFormDuplicateFormTest.php
@@ -2,11 +2,11 @@
namespace Drupal\Tests\fillpdf\Functional;
+use Drupal\Core\Url;
use Drupal\fillpdf\Entity\FillPdfForm;
use Drupal\fillpdf\Entity\FillPdfFormField;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\fillpdf\Traits\TestFillPdfTrait;
-use Drupal\Core\Url;
/**
* @coversDefaultClass \Drupal\fillpdf\Form\FillPdfFormDuplicateForm
diff --git a/tests/src/Functional/FillPdfFormImportFormTest.php b/tests/src/Functional/FillPdfFormImportFormTest.php
index cf6ebb5..2016f48 100644
--- a/tests/src/Functional/FillPdfFormImportFormTest.php
+++ b/tests/src/Functional/FillPdfFormImportFormTest.php
@@ -2,9 +2,9 @@
namespace Drupal\Tests\fillpdf\Functional;
+use Drupal\Core\Url;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\fillpdf\Traits\TestFillPdfTrait;
-use Drupal\Core\Url;
/**
* @coversDefaultClass \Drupal\fillpdf\Form\FillPdfFormImportForm
diff --git a/tests/src/Functional/FillPdfOverviewFormTest.php b/tests/src/Functional/FillPdfOverviewFormTest.php
index 570ff6a..e360aa1 100644
--- a/tests/src/Functional/FillPdfOverviewFormTest.php
+++ b/tests/src/Functional/FillPdfOverviewFormTest.php
@@ -2,10 +2,10 @@
namespace Drupal\Tests\fillpdf\Functional;
-use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
+use Drupal\Core\Url;
use Drupal\fillpdf\Entity\FillPdfForm;
+use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
use Drupal\user\Entity\Role;
-use Drupal\Core\Url;
/**
* @coversDefaultClass \Drupal\fillpdf\Form\FillPdfOverviewForm
diff --git a/tests/src/Functional/FillPdfUploadTestBase.php b/tests/src/Functional/FillPdfUploadTestBase.php
index 8ef5e7f..71ecf3c 100644
--- a/tests/src/Functional/FillPdfUploadTestBase.php
+++ b/tests/src/Functional/FillPdfUploadTestBase.php
@@ -2,9 +2,9 @@
namespace Drupal\Tests\fillpdf\Functional;
+use Drupal\Component\Render\FormattableMarkup;
use Drupal\file\Entity\File;
use Drupal\fillpdf\Component\Utility\FillPdf;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\fillpdf\FillPdfFormInterface;
/**
diff --git a/tests/src/Functional/PdfParseTest.php b/tests/src/Functional/PdfParseTest.php
index f20fb90..4e0a4cb 100644
--- a/tests/src/Functional/PdfParseTest.php
+++ b/tests/src/Functional/PdfParseTest.php
@@ -2,8 +2,8 @@
namespace Drupal\Tests\fillpdf\Functional;
-use Drupal\Core\Url;
use Drupal\Core\Config\Config;
+use Drupal\Core\Url;
use Drupal\file\Entity\File;
use Drupal\fillpdf\Component\Utility\FillPdf;
use Drupal\fillpdf\Entity\FillPdfForm;
diff --git a/tests/src/Functional/UninstallTest.php b/tests/src/Functional/UninstallTest.php
index 70380d6..8569042 100644
--- a/tests/src/Functional/UninstallTest.php
+++ b/tests/src/Functional/UninstallTest.php
@@ -2,9 +2,9 @@
namespace Drupal\Tests\fillpdf\Functional;
+use Drupal\Core\Url;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\fillpdf\Traits\TestFillPdfTrait;
-use Drupal\Core\Url;
/**
* Tests uninstalling the module.
--
GitLab