diff --git a/fillpdf.install b/fillpdf.install index 295ef24633d3b6ce53e9255238d81fed7af854e1..d96552275e7d8c224e2f45ffca57bc5df9cf6389 100644 --- a/fillpdf.install +++ b/fillpdf.install @@ -195,12 +195,17 @@ function fillpdf_update_8109() { } /** - * Install FillPDF legacy backend sub-module. + * Install 'fillpdf_legacy' sub-module, uninstall 'fillpdf_next' sub-module. */ function fillpdf_update_8110() { + /** @var \Drupal\Core\Extension\ModuleInstaller $module_installer */ + $module_installer = \Drupal::service('module_installer'); + + if (\Drupal::moduleHandler()->moduleExists('fillpdf_next')) { + $module_installer->uninstall(['fillpdf_next']); + } + if (!\Drupal::moduleHandler()->moduleExists('fillpdf_legacy')) { - /** @var \Drupal\Core\Extension\ModuleInstaller $module_installer */ - $module_installer = \Drupal::service('module_installer'); $module_installer->install(['fillpdf_legacy']); $base_url = \Drupal::request()->getBasePath(); diff --git a/modules/fillpdf_next/fillpdf_next.info.yml b/modules/fillpdf_next/fillpdf_next.info.yml index 53422bed8c5938c62e4f8d0ffa2005233d8399e3..475c3e89a4af1a590e8ad2898cf027fe543be6d1 100644 --- a/modules/fillpdf_next/fillpdf_next.info.yml +++ b/modules/fillpdf_next/fillpdf_next.info.yml @@ -1,9 +1,6 @@ name: 'FillPDF Next [EXPERIMENTAL]' type: module -description: 'Development version for the next FillPDF branch (current status: experimental, may break your site).' +description: 'Deprecated, please remove.' core: 8.x -php: 7.1 package: Other -dependencies: - - drupal:fillpdf - - drupal:devel +hidden: true diff --git a/modules/fillpdf_next/fillpdf_next.services.yml b/modules/fillpdf_next/fillpdf_next.services.yml deleted file mode 100644 index 4dacfe539ef4db1c02494740adfe00e5327fdcaf..0000000000000000000000000000000000000000 --- a/modules/fillpdf_next/fillpdf_next.services.yml +++ /dev/null @@ -1,3 +0,0 @@ -services: - fillpdf_next: - class: Drupal\fillpdf_next\FillPdfNext diff --git a/modules/fillpdf_next/src/FillPdfNext.php b/modules/fillpdf_next/src/FillPdfNext.php deleted file mode 100644 index b8b7c0aff8ef6df2d2d1182eb20708c5ce4d5008..0000000000000000000000000000000000000000 --- a/modules/fillpdf_next/src/FillPdfNext.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -namespace Drupal\fillpdf_next; - -/** - * FillPdf next service. - * - * @internal - */ -class FillPdfNext {}