Clean up drupal_block()

src/TwigExtension.php

@@ -124,46 +124,29 @@ class TwigExtension extends \Twig_Extension {
       $block_plugin->setTitle($title);
     }
 
-    $content = $block_plugin->build();
+    $build = [
-
+      'content' => $block_plugin->build(),
-    if ($content && !Element::isEmpty($content)) {
+      '#cache' => [
-      if ($wrapper) {
+        'contexts' => $block_plugin->getCacheContexts(),
-        $build = [
+        'tags' => $block_plugin->getCacheTags(),
-          '#theme' => 'block',
+        'max-age' => $block_plugin->getCacheMaxAge(),
-          '#attributes' => [],
+      ],
-          '#contextual_links' => [],
+    ];
-          '#configuration' => $block_plugin->getConfiguration(),
-          '#plugin_id' => $block_plugin->getPluginId(),
-          '#base_plugin_id' => $block_plugin->getBaseId(),
-          '#derivative_plugin_id' => $block_plugin->getDerivativeId(),
-          'content' => $content,
-          '#cache' => [
-            'contexts' => $block_plugin->getCacheContexts(),
-            'tags' => $block_plugin->getCacheTags(),
-            'max-age' => $block_plugin->getCacheMaxAge(),
-          ],
-        ];
-      }
-      else {
-        $build = $content;
-      }
-    }
-    else {
-      // Preserve cache metadata of empty blocks.
-      $build = [
-        '#markup' => '',
-        '#cache' => isset($content['#cache']) ? $content['#cache'] : [],
-      ];
-    }
 
     if ($block_plugin instanceof TitleBlockPluginInterface) {
       $build['#cache']['contexts'][] = 'url';
     }
 
-    if (!empty($content)) {
+    if ($wrapper) {
-      CacheableMetadata::createFromRenderArray($build)
+      $build += [
-        ->merge(CacheableMetadata::createFromRenderArray($content))
+        '#theme' => 'block',
-        ->applyTo($build);
+        '#attributes' => [],
+        '#contextual_links' => [],
+        '#configuration' => $block_plugin->getConfiguration(),
+        '#plugin_id' => $block_plugin->getPluginId(),
+        '#base_plugin_id' => $block_plugin->getBaseId(),
+        '#derivative_plugin_id' => $block_plugin->getDerivativeId(),
+      ];
     }
 
     return $build;