From 08a03776d6c2aaf792e5346aa482d1eab6ede54e Mon Sep 17 00:00:00 2001
From: Liam Morland <lkmorlan@uwaterloo.ca>
Date: Wed, 23 Mar 2022 15:18:49 -0400
Subject: [PATCH] Issue #3044734: Automated coding standards fixes
---
src/Component/Helper/FillPdfMappingHelper.php | 2 +-
src/Component/Utility/FillPdf.php | 4 +---
src/Controller/HandlePdfController.php | 9 +++++----
src/Entity/FillPdfForm.php | 2 +-
src/FillPdfLinkManipulatorInterface.php | 2 +-
src/Form/FillPdfFormConfirmFormBase.php | 2 +-
src/Form/FillPdfFormForm.php | 6 +++---
src/Form/FillPdfOverviewForm.php | 2 +-
src/Form/FillPdfSettingsForm.php | 8 ++++----
src/OutputHandler.php | 2 +-
src/OutputHandlerInterface.php | 2 +-
src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php | 4 ++--
src/Plugin/PdfBackend/FillPdfServicePdfBackend.php | 5 +----
src/Plugin/PdfBackend/LocalServerPdfBackend.php | 3 ---
src/Plugin/PdfBackend/PdftkPdfBackend.php | 12 ++++--------
src/Serializer.php | 2 +-
src/Service/BackendProxy.php | 2 +-
src/Service/FillPdfLinkManipulator.php | 8 ++++----
src/TokenResolver.php | 4 ++--
tests/src/Functional/FillPdfFormFormTest.php | 2 +-
tests/src/Functional/FillPdfFormImportFormTest.php | 2 +-
tests/src/Functional/FillPdfOverviewFormTest.php | 2 +-
tests/src/Functional/FillPdfUploadTestBase.php | 11 +++++------
tests/src/Functional/PdfParseTest.php | 4 ++--
tests/src/Functional/PdfPopulationTest.php | 3 ---
tests/src/Functional/PdfWebformPopulationTest.php | 2 +-
tests/src/Traits/TestFillPdfTrait.php | 2 +-
27 files changed, 47 insertions(+), 62 deletions(-)
diff --git a/src/Component/Helper/FillPdfMappingHelper.php b/src/Component/Helper/FillPdfMappingHelper.php
index 7767167..bbc88c3 100644
--- a/src/Component/Helper/FillPdfMappingHelper.php
+++ b/src/Component/Helper/FillPdfMappingHelper.php
@@ -64,7 +64,7 @@ class FillPdfMappingHelper {
@trigger_error('transformString is deprecated in fillpdf:8.x-4.7 and is removed from fillpdf:8.x-5.0. Deprecated in core. See https://www.drupal.org/project/fillpdf/issues/3044743', E_USER_DEPRECATED);
// Merge both with field-level replacements taking precedence.
$replacements = array_merge($form_replacements, $field_replacements);
- return isset($replacements[$value]) ? $replacements[$value] : $value;
+ return $replacements[$value] ?? $value;
}
}
diff --git a/src/Component/Utility/FillPdf.php b/src/Component/Utility/FillPdf.php
index 197cded..d0e4e21 100644
--- a/src/Component/Utility/FillPdf.php
+++ b/src/Component/Utility/FillPdf.php
@@ -4,10 +4,8 @@ namespace Drupal\fillpdf\Component\Utility;
use Drupal\Core\Config\Config;
use Drupal\views\Views;
-use Exception;
use GuzzleHttp\Client;
use Symfony\Component\Process\Process;
-use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
/**
* Class FillPdf.
@@ -101,7 +99,7 @@ class FillPdf {
try {
$response = $http_client->get($fillpdf_config->get('local_service_endpoint'));
}
- catch (Exception $exception) {
+ catch (\Exception $exception) {
// If any thing goes wrong, just fail the check.
return FALSE;
}
diff --git a/src/Controller/HandlePdfController.php b/src/Controller/HandlePdfController.php
index 44ffc59..8ec8934 100644
--- a/src/Controller/HandlePdfController.php
+++ b/src/Controller/HandlePdfController.php
@@ -151,7 +151,7 @@ class HandlePdfController extends ControllerBase {
// admin/structure/fillpdf/%fid.
$filename = $this->buildFilename($fillpdf_form->title->value, $entities);
- // @todo: When Rules integration ported, emit an event or whatever.
+ // @todo When Rules integration ported, emit an event or whatever.
return $this->handlePopulatedPdf($fillpdf_form, $populated_pdf, $context, $filename, $entities);
}
@@ -198,6 +198,7 @@ class HandlePdfController extends ControllerBase {
*
* @throws \Drupal\Component\Plugin\Exception\PluginException
* @throws \Drupal\Core\Entity\EntityMalformedException
+ *
* @see \Drupal\fillpdf\FillPdfLinkManipulatorInterface::parseLink()
*/
protected function handlePopulatedPdf(FillPdfFormInterface $fillpdf_form, $pdf_data, array $context, $filename, array $entities) {
@@ -215,7 +216,7 @@ class HandlePdfController extends ControllerBase {
$action_plugin_id = 'download';
}
elseif (!$is_available || !$is_allowed) {
- // @todo: We don't need the ID once an admin_title is #required,
+ // @todo We don't need the ID once an admin_title is #required,
// see https://www.drupal.org/project/fillpdf/issues/3040776.
$label = $fillpdf_form->label() . " ({$fillpdf_form->id()})";
$this->getLogger('fillpdf')->critical('Saving a generated PDF file in unavailable storage scheme %scheme failed.', [
@@ -235,11 +236,11 @@ class HandlePdfController extends ControllerBase {
$action_plugin_id = $redirect ? 'redirect' : 'save';
}
- // @todo: Remove in FillPDF 5.x. The filename is not part of the context and
+ // @todo Remove in FillPDF 5.x. The filename is not part of the context and
// is separately available anyway.
$context['filename'] = $filename;
- // @todo: Rename 'token_objects' to 'entities' in FillPDF 5.x. Webform
+ // @todo Rename 'token_objects' to 'entities' in FillPDF 5.x. Webform
// submissions are now entities, too.
$action_configuration = [
'form' => $fillpdf_form,
diff --git a/src/Entity/FillPdfForm.php b/src/Entity/FillPdfForm.php
index f239a94..9351e90 100644
--- a/src/Entity/FillPdfForm.php
+++ b/src/Entity/FillPdfForm.php
@@ -123,7 +123,7 @@ class FillPdfForm extends ContentEntityBase implements FillPdfFormInterface {
],
]);
- // @todo: add post_save_redirect field for where to send the browser by default after they generate a PDF
+ // @todo add post_save_redirect field for where to send the browser by default after they generate a PDF
$fields['scheme'] = BaseFieldDefinition::create('list_string')
->setLabel('File storage')
->setSettings([
diff --git a/src/FillPdfLinkManipulatorInterface.php b/src/FillPdfLinkManipulatorInterface.php
index 991ec11..3f76139 100644
--- a/src/FillPdfLinkManipulatorInterface.php
+++ b/src/FillPdfLinkManipulatorInterface.php
@@ -25,7 +25,7 @@ interface FillPdfLinkManipulatorInterface {
*
* @see \Drupal\fillpdf\FillPdfLinkManipulatorInterface::parseLink()
*
- * @todo: Move this elsewhere, maybe to that current_fillpdf_link service I was thinking of or whatever it was.
+ * @todo Move this elsewhere, maybe to that current_fillpdf_link service I was thinking of or whatever it was.
*/
public function parseRequest(Request $request);
diff --git a/src/Form/FillPdfFormConfirmFormBase.php b/src/Form/FillPdfFormConfirmFormBase.php
index df7b98f..12e9d23 100644
--- a/src/Form/FillPdfFormConfirmFormBase.php
+++ b/src/Form/FillPdfFormConfirmFormBase.php
@@ -16,7 +16,7 @@ abstract class FillPdfFormConfirmFormBase extends ContentEntityConfirmFormBase {
* {@inheritdoc}
*/
protected function actions(array $form, FormStateInterface $form_state) {
- // @todo: This is a workaround by webform for Core issue #2582295
+ // @todo This is a workaround by webform for Core issue #2582295
// "Confirmation cancel links are incorrect if installed in a subdirectory".
// Remove after a fix landed there.
// See: https://www.drupal.org/project/drupal/issues/2582295
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index 49e0f2c..e502ab5 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -130,7 +130,7 @@ class FillPdfFormForm extends ContentEntityForm {
$form['title']['token_tree'] = $this->adminFormHelper->getAdminTokenForm();
- // @todo: Encapsulate this logic into a ::getDefaultEntityType() method on FillPdfForm
+ // @todo Encapsulate this logic into a ::getDefaultEntityType() method on FillPdfForm
$stored_default_entity_type = $fillpdf_form->get('default_entity_type');
$default_entity_type = count($stored_default_entity_type) ? $stored_default_entity_type->first()->value : NULL;
@@ -317,7 +317,7 @@ class FillPdfFormForm extends ContentEntityForm {
'#type' => 'container',
];
- // @todo: Check for empty value after Core issue is fixed.
+ // @todo Check for empty value after Core issue is fixed.
// See: https://www.drupal.org/project/drupal/issues/1585930
$states_no_scheme = [
':input[name="scheme"]' => ['value' => '_none'],
@@ -386,7 +386,7 @@ class FillPdfFormForm extends ContentEntityForm {
$form['owner_password']['#group'] = 'security';
$form['user_password']['#group'] = 'security';
- // @todo: Add a button to let them attempt re-parsing if it failed.
+ // @todo Add a button to let them attempt re-parsing if it failed.
$form['fillpdf_fields']['fields'] = FillPdf::embedView('fillpdf_form_fields',
'block_1',
$fillpdf_form->id());
diff --git a/src/Form/FillPdfOverviewForm.php b/src/Form/FillPdfOverviewForm.php
index ab3828d..688ec8a 100644
--- a/src/Form/FillPdfOverviewForm.php
+++ b/src/Form/FillPdfOverviewForm.php
@@ -93,7 +93,7 @@ class FillPdfOverviewForm extends FormBase {
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state) {
- // @todo: convert to OOP
+ // @todo convert to OOP
$form['existing_forms'] = views_embed_view('fillpdf_forms', 'block_1');
$config = $this->config('fillpdf.settings');
diff --git a/src/Form/FillPdfSettingsForm.php b/src/Form/FillPdfSettingsForm.php
index 5590c8b..93dbc81 100644
--- a/src/Form/FillPdfSettingsForm.php
+++ b/src/Form/FillPdfSettingsForm.php
@@ -163,7 +163,7 @@ class FillPdfSettingsForm extends ConfigFormBase {
'%system_settings' => Link::createFromRoute($this->t('File system settings'), 'system.file_system_settings')->toString(),
]));
- // @todo: It would be helpful if we could use EntityQuery instead, see
+ // @todo It would be helpful if we could use EntityQuery instead, see
// https://www.drupal.org/project/fillpdf/issues/3043508.
$map = $this->adminFormHelper->getFormsByTemplateScheme($template_scheme);
if ($count = count($map)) {
@@ -172,7 +172,7 @@ class FillPdfSettingsForm extends ConfigFormBase {
foreach ($map as $form_id => $file_uri) {
$fillpdf_form = $forms[$form_id];
$admin_title = current($fillpdf_form->get('admin_title')->getValue());
- // @todo: We can simpify this once an admin_title is #required,
+ // @todo We can simpify this once an admin_title is #required,
// see https://www.drupal.org/project/fillpdf/issues/3040776.
$link = Link::fromTextAndUrl($admin_title ?: "FillPDF form {$fillpdf_form->id()}", $fillpdf_form->toUrl());
$items[$form_id] = new FormattableMarkup("@fillpdf_form: {$file_uri}", ['@fillpdf_form' => $link->toString()]);
@@ -318,7 +318,7 @@ class FillPdfSettingsForm extends ConfigFormBase {
'#options' => $locales,
'#default_value' => $config->get('shell_locale') ?: 'en_US.utf8',
];
- // @todo: We're working around Core issue #2190333, resp. #2854166.
+ // @todo We're working around Core issue #2190333, resp. #2854166.
// Remove once one of these landed. See:
// https://www.drupal.org/project/drupal/issues/2854166.
$form['shell_locale']['#process'][] = ['Drupal\Core\Render\Element\Select', 'processGroup'];
@@ -336,7 +336,7 @@ class FillPdfSettingsForm extends ConfigFormBase {
switch ($values['backend']) {
case 'fillpdf_service':
- // @todo: Add validation for FillPDF Service.
+ // @todo Add validation for FillPDF Service.
// See https://www.drupal.org/project/fillpdf/issues/3040899.
break;
diff --git a/src/OutputHandler.php b/src/OutputHandler.php
index f93ac25..37de557 100644
--- a/src/OutputHandler.php
+++ b/src/OutputHandler.php
@@ -72,7 +72,7 @@ class OutputHandler implements OutputHandlerInterface {
/** @var \Drupal\fillpdf\Entity\FillPdfForm $fillpdf_form */
$fillpdf_form = $configuration['form'];
- // @todo: Rename 'token_objects' to 'entities' in FillPDF 5.x. Webform
+ // @todo Rename 'token_objects' to 'entities' in FillPDF 5.x. Webform
// submissions are now entities, too.
/** @var \Drupal\Core\Entity\EntityInterface[] $entities */
$entities = $configuration['token_objects'];
diff --git a/src/OutputHandlerInterface.php b/src/OutputHandlerInterface.php
index 8fb7fce..b691b07 100644
--- a/src/OutputHandlerInterface.php
+++ b/src/OutputHandlerInterface.php
@@ -33,7 +33,7 @@ interface OutputHandlerInterface {
* @see \Drupal\fillpdf\FillPdfLinkManipulatorInterface::parseLink()
* @see \Drupal\fillpdf\Plugin\FillPdfActionPlugin\FillPdfSaveAction::savePdf()
*
- * @todo: Rename 'token_objects' to 'entities' in FillPDF 5.x. Webform
+ * @todo Rename 'token_objects' to 'entities' in FillPDF 5.x. Webform
* submissions are now entities, too.
*/
public function savePdfToFile(array $configuration, $destination_path_override = NULL);
diff --git a/src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php b/src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php
index 4dc475d..280a060 100644
--- a/src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php
+++ b/src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php
@@ -68,7 +68,7 @@ class FillPdfSaveAction extends FillPdfActionPluginBase {
public function execute() {
$this->savePdf();
- // @todo: Fix based on value of post_save_redirect, once I add that
+ // @todo Fix based on value of post_save_redirect, once I add that
$response = new RedirectResponse(Url::fromRoute('<front>')->toString());
return $response;
}
@@ -82,7 +82,7 @@ class FillPdfSaveAction extends FillPdfActionPluginBase {
* @see \Drupal\fillpdf\OutputHandlerInterface::savePdfToFile()
*/
protected function savePdf() {
- // @todo: Error handling?
+ // @todo Error handling?
return $this->outputHandler->savePdfToFile($this->configuration);
}
diff --git a/src/Plugin/PdfBackend/FillPdfServicePdfBackend.php b/src/Plugin/PdfBackend/FillPdfServicePdfBackend.php
index 1667576..402f85e 100644
--- a/src/Plugin/PdfBackend/FillPdfServicePdfBackend.php
+++ b/src/Plugin/PdfBackend/FillPdfServicePdfBackend.php
@@ -2,12 +2,9 @@
namespace Drupal\fillpdf\Plugin\PdfBackend;
-use Drupal\file\Entity\File;
use Drupal\file\FileInterface;
use Drupal\fillpdf\FieldMapping\ImageFieldMapping;
use Drupal\fillpdf\FieldMapping\TextFieldMapping;
-use Drupal\fillpdf\FillPdfBackendPluginInterface;
-use Drupal\fillpdf\FillPdfFormInterface;
use Drupal\fillpdf\Plugin\PdfBackendBase;
/**
@@ -43,7 +40,7 @@ class FillPdfServicePdfBackend extends PdfBackendBase {
$result = $this->xmlRpcRequest('parse_pdf_fields', base64_encode($pdf_content));
if ($result->error == TRUE) {
- // @todo: Throw an exception, log a message etc.
+ // @todo Throw an exception, log a message etc.
return [];
} // after setting error message
diff --git a/src/Plugin/PdfBackend/LocalServerPdfBackend.php b/src/Plugin/PdfBackend/LocalServerPdfBackend.php
index 3e5be2e..3f65267 100644
--- a/src/Plugin/PdfBackend/LocalServerPdfBackend.php
+++ b/src/Plugin/PdfBackend/LocalServerPdfBackend.php
@@ -6,9 +6,6 @@ use function GuzzleHttp\json_encode;
use function GuzzleHttp\json_decode;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\file\FileInterface;
-use Drupal\file\Entity\File;
-use Drupal\fillpdf\FillPdfBackendPluginInterface;
-use Drupal\fillpdf\FillPdfFormInterface;
use Drupal\fillpdf\FieldMapping\ImageFieldMapping;
use Drupal\fillpdf\FieldMapping\TextFieldMapping;
use Drupal\fillpdf\Plugin\PdfBackendBase;
diff --git a/src/Plugin/PdfBackend/PdftkPdfBackend.php b/src/Plugin/PdfBackend/PdftkPdfBackend.php
index 83f1ee7..ea0b1df 100644
--- a/src/Plugin/PdfBackend/PdftkPdfBackend.php
+++ b/src/Plugin/PdfBackend/PdftkPdfBackend.php
@@ -5,15 +5,11 @@ namespace Drupal\fillpdf\Plugin\PdfBackend;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\File\FileSystem;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\file\Entity\File;
use Drupal\file\FileInterface;
use Drupal\fillpdf\Component\Utility\FillPdf;
use Drupal\fillpdf\FieldMapping\TextFieldMapping;
-use Drupal\fillpdf\FillPdfBackendPluginInterface;
-use Drupal\fillpdf\FillPdfFormInterface;
use Drupal\fillpdf\Plugin\PdfBackendBase;
use Drupal\fillpdf\ShellManager;
-use InvalidArgumentException;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\File\FileSystemInterface;
@@ -145,7 +141,7 @@ class PdftkPdfBackend extends PdfBackendBase implements ContainerFactoryPluginIn
continue;
}
// Separate the data key from the data value.
- list($key, $value) = explode(':', $lineitem);
+ [$key, $value] = explode(':', $lineitem);
if (in_array($key, array_keys($data_fields_map), NULL)) {
// Trim spaces.
$fields[$fieldindex][$data_fields_map[$key]] = trim($value);
@@ -164,7 +160,7 @@ class PdftkPdfBackend extends PdfBackendBase implements ContainerFactoryPluginIn
* @internal
*/
protected function getPdftkPath() {
- return isset($this->configuration['pdftk_path']) ? $this->configuration['pdftk_path'] : 'pdftk';
+ return $this->configuration['pdftk_path'] ?? 'pdftk';
}
/**
@@ -193,9 +189,9 @@ class PdftkPdfBackend extends PdfBackendBase implements ContainerFactoryPluginIn
// Generate the file.
$xfdf_file = file_save_data($xfdf, $xfdf_name, FileSystemInterface::EXISTS_RENAME);
- // @todo: Improve this approach when we turn $context into a value object.
+ // @todo Improve this approach when we turn $context into a value object.
if (!isset($context['fid'])) {
- throw new InvalidArgumentException("pdftk requires \$context['fid'] to be set to the ID of the FillPDF Form so that it can check if encryption is configured. The merge was aborted because it was not set.");
+ throw new \InvalidArgumentException("pdftk requires \$context['fid'] to be set to the ID of the FillPDF Form so that it can check if encryption is configured. The merge was aborted because it was not set.");
}
$fillpdf_form = $this->entityTypeManager->getStorage('fillpdf_form')->load($context['fid']);
diff --git a/src/Serializer.php b/src/Serializer.php
index 270c4cb..c1c724e 100644
--- a/src/Serializer.php
+++ b/src/Serializer.php
@@ -68,7 +68,7 @@ class Serializer implements SerializerInterface {
foreach ($field_json as $normalized_field) {
$field = $this->serializer->denormalize($normalized_field, 'Drupal\fillpdf\Entity\FillPdfFormField');
- // @todo: Exported fields are now already keyed by PDF key. For now, we're
+ // @todo Exported fields are now already keyed by PDF key. For now, we're
// not using the array keys to remain compatible with previous exports,
// but should do so that at some later point.
$decoded_fields[$field->pdf_key->value] = $field;
diff --git a/src/Service/BackendProxy.php b/src/Service/BackendProxy.php
index 193f2b8..f908267 100644
--- a/src/Service/BackendProxy.php
+++ b/src/Service/BackendProxy.php
@@ -97,7 +97,7 @@ class BackendProxy implements BackendProxyInterface {
/** @var \Drupal\fillpdf\FillPdfBackendPluginInterface|\Drupal\fillpdf\Plugin\PdfBackendInterface $backend */
$backend = $this->backendManager->createInstance($config->get('backend'), $config->get());
- // @todo: Emit event (or call alter hook?) before populating PDF.
+ // @todo Emit event (or call alter hook?) before populating PDF.
// Rename fillpdf_merge_fields_alter() to fillpdf_populate_fields_alter().
/** @var \Drupal\file\FileInterface $templateFile */
$templateFile = File::load($fillPdfForm->file->target_id);
diff --git a/src/Service/FillPdfLinkManipulator.php b/src/Service/FillPdfLinkManipulator.php
index da63f3e..6bfaeeb 100644
--- a/src/Service/FillPdfLinkManipulator.php
+++ b/src/Service/FillPdfLinkManipulator.php
@@ -16,11 +16,11 @@ class FillPdfLinkManipulator implements FillPdfLinkManipulatorInterface {
/**
* {@inheritdoc}
*
- * @todo: Maybe this should return a FillPdfLinkContext object or something?
+ * @todo Maybe this should return a FillPdfLinkContext object or something?
* Guess it depends on how much I end up needing to change it.
*/
public function parseRequest(Request $request) {
- // @todo: Use Url::fromRequest when/if it lands in core. See https://www.drupal.org/node/2605530
+ // @todo Use Url::fromRequest when/if it lands in core. See https://www.drupal.org/node/2605530
$path = $request->getUri();
$request_url = $this->createUrlFromString($path);
@@ -156,7 +156,7 @@ class FillPdfLinkManipulator implements FillPdfLinkManipulatorInterface {
// Re-key entity IDs so they can be loaded easily with loadMultiple().
foreach ($query['entity_ids'] as $entity_id) {
- list($entity_type, $entity_id) = array_pad(explode(':', $entity_id), -2, '');
+ [$entity_type, $entity_id] = array_pad(explode(':', $entity_id), -2, '');
if (empty($entity_type)) {
$entity_type = !empty($query['entity_type']) ? $query['entity_type'] : 'node';
}
@@ -201,7 +201,7 @@ class FillPdfLinkManipulator implements FillPdfLinkManipulatorInterface {
* @internal
*/
public static function prepareBooleanFlags(array $parameters) {
- // @todo: Create a value object for FillPdfMergeContext and get the defaults
+ // @todo Create a value object for FillPdfMergeContext and get the defaults
// here from that.
$query = [];
diff --git a/src/TokenResolver.php b/src/TokenResolver.php
index 88225a2..36a977f 100644
--- a/src/TokenResolver.php
+++ b/src/TokenResolver.php
@@ -76,7 +76,7 @@ class TokenResolver implements TokenResolverInterface {
}
// Content may be marked as either 'text', 'image' or '' (= unknown).
- // @todo: Revisit when enforcing FillPdfFields to be one or the other.
+ // @todo Revisit when enforcing FillPdfFields to be one or the other.
// See: https://www.drupal.org/project/fillpdf/issues/3049368
$maybe_image = ($options['content'] !== 'text');
$maybe_text = ($options['content'] !== 'image');
@@ -205,7 +205,7 @@ class TokenResolver implements TokenResolverInterface {
// Loop through the tokens, starting with the last one.
foreach (array_reverse($tokens) as $token) {
// Explode token into its field_name and property parts.
- list($field_name, $property) = array_pad(explode(':', $token), 2, '');
+ [$field_name, $property] = array_pad(explode(':', $token), 2, '');
if (!$entity->hasField($field_name)) {
continue;
diff --git a/tests/src/Functional/FillPdfFormFormTest.php b/tests/src/Functional/FillPdfFormFormTest.php
index 549d729..e33752f 100644
--- a/tests/src/Functional/FillPdfFormFormTest.php
+++ b/tests/src/Functional/FillPdfFormFormTest.php
@@ -48,7 +48,7 @@ class FillPdfFormFormTest extends FillPdfUploadTestBase {
'user' => [26, $this->adminUser->id(), $this->adminUser->label()],
];
- foreach ($testcases as $type => list($count, $id, $label)) {
+ foreach ($testcases as $type => [$count, $id, $label]) {
// Set a default entity type and check if it's properly saved.
$this->drupalPostForm(NULL, ['default_entity_type' => $type], self::OP_SAVE);
$this->assertSession()->pageTextContains("FillPDF Form has been updated.");
diff --git a/tests/src/Functional/FillPdfFormImportFormTest.php b/tests/src/Functional/FillPdfFormImportFormTest.php
index ed7db69..83b036e 100644
--- a/tests/src/Functional/FillPdfFormImportFormTest.php
+++ b/tests/src/Functional/FillPdfFormImportFormTest.php
@@ -60,7 +60,7 @@ class FillPdfFormImportFormTest extends BrowserTestBase {
$form2_id = $this->getLatestFillPdfForm();
// Change some configuration.
- // @todo: Even without a destination set, we should always return somewhere
+ // @todo Even without a destination set, we should always return somewhere
// instead of remaining on the duplicate confirm page.
$edit = [
'replacements[0][value]' => 'n|No',
diff --git a/tests/src/Functional/FillPdfOverviewFormTest.php b/tests/src/Functional/FillPdfOverviewFormTest.php
index 4410727..5281775 100644
--- a/tests/src/Functional/FillPdfOverviewFormTest.php
+++ b/tests/src/Functional/FillPdfOverviewFormTest.php
@@ -72,7 +72,7 @@ class FillPdfOverviewFormTest extends FillPdfUploadTestBase {
/**
* Tests an entity reference to a FillPdfForm.
*
- * @todo: This doesn't belong here.
+ * @todo This doesn't belong here.
*/
public function testEntityReference() {
// Create new FillPdfForm.
diff --git a/tests/src/Functional/FillPdfUploadTestBase.php b/tests/src/Functional/FillPdfUploadTestBase.php
index 793b47d..d313327 100644
--- a/tests/src/Functional/FillPdfUploadTestBase.php
+++ b/tests/src/Functional/FillPdfUploadTestBase.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\fillpdf\Functional;
-use Drupal;
use Drupal\file\Entity\File;
use Drupal\fillpdf\Component\Utility\FillPdf;
use Drupal\Component\Render\FormattableMarkup;
@@ -111,8 +110,8 @@ abstract class FillPdfUploadTestBase extends FillPdfTestBase {
/** @var \Drupal\file\FileInterface $new_file */
$new_file = File::load($this->getLastFileId());
$new_filename = $new_file->getFilename();
- if (version_compare(Drupal::VERSION, '8.8.0', '<')) {
- // @todo: REMOVE when Drupal 8.7.x is no longer supported.
+ if (version_compare(\Drupal::VERSION, '8.8.0', '<')) {
+ // @todo REMOVE when Drupal 8.7.x is no longer supported.
$this->assertFileExists($new_file);
}
else {
@@ -137,8 +136,8 @@ abstract class FillPdfUploadTestBase extends FillPdfTestBase {
// Now remove the PDF file again. The temporary file should now be
// removed both from the disk and the database.
$this->drupalPostForm(NULL, NULL, self::OP_REMOVE);
- if (version_compare(Drupal::VERSION, '8.8.0', '<')) {
- // @todo: REMOVE when Drupal 8.7.x is no longer supported.
+ if (version_compare(\Drupal::VERSION, '8.8.0', '<')) {
+ // @todo REMOVE when Drupal 8.7.x is no longer supported.
$this->assertFileNotExists($new_file);
}
else {
@@ -155,7 +154,7 @@ abstract class FillPdfUploadTestBase extends FillPdfTestBase {
$this->assertSession()->pageTextNotContains('Your previous field mappings have been transferred to the new PDF template you uploaded.');
// There should be four fields in the correct order.
- // @todo: Add some CSS markup to the view so we can test the order.
+ // @todo Add some CSS markup to the view so we can test the order.
$this->assertSession()->pageTextContainsOnce('ImageField');
$this->assertSession()->pageTextContainsOnce('TestButton');
$this->assertSession()->pageTextContainsOnce('TextField1');
diff --git a/tests/src/Functional/PdfParseTest.php b/tests/src/Functional/PdfParseTest.php
index 58f2d3f..150ce89 100644
--- a/tests/src/Functional/PdfParseTest.php
+++ b/tests/src/Functional/PdfParseTest.php
@@ -97,7 +97,7 @@ class PdfParseTest extends FillPdfTestBase {
$this->assertSession()->pageTextNotContains('Merging the FillPDF Form failed');
// Retrieve the last file ID which should be the sample file.
- // @todo: When using pdftk, the saved xfdf file leads to the file counter
+ // @todo When using pdftk, the saved xfdf file leads to the file counter
// being increased by two instead of 1. We're therefore only comparing by
// "greater than".
$file_id = $this->getLastFileId();
@@ -116,7 +116,7 @@ class PdfParseTest extends FillPdfTestBase {
// sample functionality does that).
foreach ($backend->parseFile($file) as $field) {
if ($field['type'] == 'Text') {
- $value = isset($field['value']) ? $field['value'] : NULL;
+ $value = $field['value'] ?? NULL;
static::assertEquals("<{$field['name']}>", $value);
}
}
diff --git a/tests/src/Functional/PdfPopulationTest.php b/tests/src/Functional/PdfPopulationTest.php
index 2ad160a..3a1c1bf 100644
--- a/tests/src/Functional/PdfPopulationTest.php
+++ b/tests/src/Functional/PdfPopulationTest.php
@@ -5,9 +5,6 @@ namespace Drupal\Tests\fillpdf\Functional;
use Drupal\file\Entity\File;
use Drupal\fillpdf\Component\Utility\FillPdf;
use Drupal\fillpdf\Entity\FillPdfForm;
-use Drupal\fillpdf\FieldMapping\ImageFieldMapping;
-use Drupal\fillpdf\FieldMapping\TextFieldMapping;
-use Drupal\fillpdf_test\Plugin\PdfBackend\TestFillPdfBackend;
use Drupal\fillpdf_test\Plugin\PdfBackend\TestPdfBackend;
use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;
use Drupal\user\Entity\Role;
diff --git a/tests/src/Functional/PdfWebformPopulationTest.php b/tests/src/Functional/PdfWebformPopulationTest.php
index 580e0ac..fc733d2 100644
--- a/tests/src/Functional/PdfWebformPopulationTest.php
+++ b/tests/src/Functional/PdfWebformPopulationTest.php
@@ -43,7 +43,7 @@ class PdfWebformPopulationTest extends FillPdfTestBase {
* {@inheritdoc}
*/
protected function setUp(): void {
- // @todo: Stop skipping this test when Webform has Drupal 9 support.
+ // @todo Stop skipping this test when Webform has Drupal 9 support.
if (version_compare(substr(\Drupal::VERSION, 0, 1), 9, '>=')) {
$this->markTestSkipped('Webform is not yet compatible with Drupal 9, so skipping these tests.');
}
diff --git a/tests/src/Traits/TestFillPdfTrait.php b/tests/src/Traits/TestFillPdfTrait.php
index 6a65cce..946ec5c 100644
--- a/tests/src/Traits/TestFillPdfTrait.php
+++ b/tests/src/Traits/TestFillPdfTrait.php
@@ -110,7 +110,7 @@ trait TestFillPdfTrait {
};
$edit = [
- 'files[upload_pdf]' => isset($path) ? $path : NULL,
+ 'files[upload_pdf]' => $path ?? NULL,
];
$this->drupalPostForm('admin/structure/fillpdf', $edit, 'Create');
$this->assertSession()->statusCodeEquals(200);
--
GitLab