From f732bcee7d5b89ae567d4851811cca92cac699bd Mon Sep 17 00:00:00 2001
From: Bernd Oliver Suenderhauf <bos@suenderhauf.de>
Date: Fri, 21 Jun 2019 14:43:13 +0200
Subject: [PATCH] Issue #3046530 by Pancho, wizonesolutions: Revert: Add
experimental sub-module to switch between BC and Next API
---
fillpdf.install | 11 ++++++++---
modules/fillpdf_next/fillpdf_next.info.yml | 7 ++-----
modules/fillpdf_next/fillpdf_next.services.yml | 3 ---
modules/fillpdf_next/src/FillPdfNext.php | 10 ----------
4 files changed, 10 insertions(+), 21 deletions(-)
delete mode 100644 modules/fillpdf_next/fillpdf_next.services.yml
delete mode 100644 modules/fillpdf_next/src/FillPdfNext.php
diff --git a/fillpdf.install b/fillpdf.install
index 295ef24..d965522 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 53422be..475c3e8 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 4dacfe5..0000000
--- 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 b8b7c0a..0000000
--- a/modules/fillpdf_next/src/FillPdfNext.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\fillpdf_next;
-
-/**
- * FillPdf next service.
- *
- * @internal
- */
-class FillPdfNext {}
--
GitLab