From 5bbe21f83144d91f8c3877bfdb5dc247353f6480 Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Thu, 7 Dec 2017 09:56:56 +0100
Subject: [PATCH 1/4] Corrected the fences dependency notation.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 716265e..aea4a15 100644
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,6 @@
         }
     ],
     "require": {
-        "drupal/fences": "^8.2"
+        "drupal/fences": "^2.0@alpha"
     }
 }

From e371e72b0d89c6f5825bf36390135626548d85e0 Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Mon, 11 Dec 2017 17:26:45 +0100
Subject: [PATCH 2/4] Update fences_block.module

---
 fences_block.module | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/fences_block.module b/fences_block.module
index 79f522f..a2c62d9 100644
--- a/fences_block.module
+++ b/fences_block.module
@@ -10,10 +10,19 @@ use Drupal\fences_block\FencesBlock;
 
 /**
  * Implements hook_theme_registry_alter().
+ * // #webksde#JP20171211: Hack: This is killing custom theme overrides: => Removed <=
+ * https://www.drupal.org/project/2856428/issues/2929951
  */
-function fences_block_theme_registry_alter(array &$theme_registry) {
-  $path = drupal_get_path('module', 'fences_block');
-  $theme_registry['block']['path'] = $path . '/templates';
+//function fences_block_theme_registry_alter(array &$theme_registry) {
+  //  $path = drupal_get_path('module', 'fences_block');
+  //  $theme_registry['block']['path'] = $path . '/templates';
+//}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function fences_block_form_block_form_alter(array &$form, FormStateInterface $form_state) {
+  FencesBlock::addConfigForm($form, $form_state);
 }
 
 /**

From 11a3e583c616b8e67f034675e871f340d3985ecd Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Tue, 12 Dec 2017 16:13:02 +0100
Subject: [PATCH 3/4] Update fences_block.module

Fixed double paste.
---
 fences_block.module | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/fences_block.module b/fences_block.module
index a2c62d9..61682ef 100644
--- a/fences_block.module
+++ b/fences_block.module
@@ -25,13 +25,6 @@ function fences_block_form_block_form_alter(array &$form, FormStateInterface $fo
   FencesBlock::addConfigForm($form, $form_state);
 }
 
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function fences_block_form_block_form_alter(array &$form, FormStateInterface $form_state) {
-  FencesBlock::addConfigForm($form, $form_state);
-}
-
 /**
  * Implements hook_preprocess_HOOK().
  */

From 21710e89e2dd6cfc2f6cd7d4fb54df3b75d9399e Mon Sep 17 00:00:00 2001
From: Julian Pustkuchen <Julian@Pustkuchen.com>
Date: Tue, 4 Jun 2019 10:59:50 +0200
Subject: [PATCH 4/4] Update FencesBlock.php

Fixed 8.7.x compatibility where buildBlockEntity throws an error for the 2nd Parameter $entity which was typed as Drupal\Core\Entity\Entity before.
---
 src/FencesBlock.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/FencesBlock.php b/src/FencesBlock.php
index a9167b9..37c0010 100644
--- a/src/FencesBlock.php
+++ b/src/FencesBlock.php
@@ -3,7 +3,7 @@
 namespace Drupal\fences_block;
 
 use Drupal\Core\Config\Entity\ThirdPartySettingsInterface;
-use Drupal\Core\Entity\Entity;
+use Drupal\block\BlockInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\block\Entity\Block;
@@ -96,7 +96,7 @@ public static function addConfigForm(array &$form, FormStateInterface $form_stat
    *
    * @param string $entity_type_id
    *   The entity type identifier.
-   * @param \Drupal\Core\Entity\Entity $entity
+   * @param \Drupal\block\BlockInterface $entity
    *   The entity object.
    * @param array &$form
    *   An array of form elements.
@@ -105,7 +105,7 @@ public static function addConfigForm(array &$form, FormStateInterface $form_stat
    */
   public static function buildBlockEntity(
     $entity_type_id,
-    Entity $entity,
+    BlockInterface $entity,
     array &$form,
     FormStateInterface &$form_state
   ) {