Issue #3272528: API change: Rename token_objects to entities

src/Controller/HandlePdfController.php

@@ -266,12 +266,10 @@ class HandlePdfController extends ControllerBase {
     // is separately available anyway.
     $context['filename'] = $filename;
 
-    // @todo Rename 'token_objects' to 'entities' in FillPDF 5.x. Webform
-    // submissions are now entities, too.
     $action_configuration = [
       'form' => $fillpdf_form,
       'context' => $context,
-      'token_objects' => $entities,
+      'entities' => $entities,
       'data' => $pdf_data,
       'filename' => $filename,
     ];

src/OutputHandler.php

@@ -72,10 +72,8 @@ 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
-    // submissions are now entities, too.
     /** @var \Drupal\Core\Entity\EntityInterface[] $entities */
-    $entities = $configuration['token_objects'];
+    $entities = $configuration['entities'];
 
     $destination_path = 'fillpdf';
     if (!empty($destination_path_override)) {

src/OutputHandlerInterface.php

@@ -19,7 +19,7 @@ interface OutputHandlerInterface {
    *     form: The FillPdfForm object from which the PDF was generated.
    *     context: The FillPDF request context as returned by
    *       FillPdfLinkManipulatorInterface::parseLink().
-   *     token_objects: The token data from which the PDF was generated.
+   *     entities: The entities from which the PDF was generated.
    *     data: The populated PDF data itself.
    *     filename: The filename (not including path) with which
    *       the PDF should be presented.
@@ -32,9 +32,6 @@ 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
-   *   submissions are now entities, too.
    */
   public function savePdfToFile(array $configuration, $destination_path_override = NULL);