Update to Drupal 8.0-dev-2015-11-17. Commits through da81cd220, Tue Nov 17 15:53:49 2015 +0000, Issue #2617224 by Wim Leers: Move around/fix some documentation.

core/modules/block/block.module

@@ -89,7 +89,10 @@ function block_page_top(array &$page_top) {
  */
 function block_themes_installed($theme_list) {
   foreach ($theme_list as $theme) {
-    block_theme_initialize($theme);
+    // Don't initialize themes that are not displayed in the UI.
+    if (\Drupal::service('theme_handler')->hasUi($theme)) {
+      block_theme_initialize($theme);
+    }
   }
 }
 

core/modules/block/src/Controller/BlockController.php

@@ -11,6 +11,7 @@ use Drupal\Component\Utility\Html;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Controller routines for admin block routes.
@@ -53,6 +54,10 @@ class BlockController extends ControllerBase {
    *   A #type 'page' render array containing the block region demo.
    */
   public function demo($theme) {
+    if (!$this->themeHandler->hasUi($theme)) {
+      throw new NotFoundHttpException();
+    }
+
     $page = [
       '#title' => Html::escape($this->themeHandler->getName($theme)),
       '#type' => 'page',

core/modules/block/src/Controller/BlockListController.php

@@ -8,13 +8,42 @@
 namespace Drupal\block\Controller;
 
 use Drupal\Core\Entity\Controller\EntityListController;
+use Drupal\Core\Extension\ThemeHandlerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Defines a controller to list blocks.
  */
 class BlockListController extends EntityListController {
 
+  /**
+   * The theme handler.
+   *
+   * @var \Drupal\Core\Extension\ThemeHandlerInterface
+   */
+  protected $themeHandler;
+
+  /**
+   * Constructs the BlockListController.
+   *
+   * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
+   *   The theme handler.
+   */
+  public function __construct(ThemeHandlerInterface $theme_handler) {
+    $this->themeHandler = $theme_handler;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('theme_handler')
+    );
+  }
+
   /**
    * Shows the block administration page.
    *
@@ -28,6 +57,10 @@ class BlockListController extends EntityListController {
    */
   public function listing($theme = NULL, Request $request = NULL) {
     $theme = $theme ?: $this->config('system.theme')->get('default');
+    if (!$this->themeHandler->hasUi($theme)) {
+      throw new NotFoundHttpException();
+    }
+
     return $this->entityManager()->getListBuilder('block')->render($theme, $request);
   }
 

core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php

@@ -50,7 +50,7 @@ class ThemeLocalTask extends DeriverBase implements ContainerDeriverInterface {
     $default_theme = $this->themeHandler->getDefault();
 
     foreach ($this->themeHandler->listInfo() as $theme_name => $theme) {
-      if ($theme->status) {
+      if ($this->themeHandler->hasUi($theme_name)) {
         $this->derivatives[$theme_name] = $base_plugin_definition;
         $this->derivatives[$theme_name]['title'] = $theme->info['name'];
         $this->derivatives[$theme_name]['route_parameters'] = array('theme' => $theme_name);

core/modules/block/src/Tests/BlockHiddenRegionTest.php

@@ -56,7 +56,9 @@ class BlockHiddenRegionTest extends WebTestBase {
 
     // Install "block_test_theme" and set it as the default theme.
     $theme = 'block_test_theme';
-    \Drupal::service('theme_handler')->install(array($theme));
+    // We need to install a non-hidden theme so that there is more than one
+    // local task.
+    \Drupal::service('theme_handler')->install(array($theme, 'stark'));
     $this->config('system.theme')
       ->set('default', $theme)
       ->save();

core/modules/block/src/Tests/BlockTest.php

@@ -197,9 +197,9 @@ class BlockTest extends BlockTestBase {
    */
   public function testBlockThemeSelector() {
     // Install all themes.
-    \Drupal::service('theme_handler')->install(array('bartik', 'seven'));
+    \Drupal::service('theme_handler')->install(['bartik', 'seven', 'stark']);
     $theme_settings = $this->config('system.theme');
-    foreach (array('bartik', 'classy', 'seven') as $theme) {
+    foreach (['bartik', 'seven', 'stark'] as $theme) {
       $this->drupalGet('admin/structure/block/list/' . $theme);
       $this->assertTitle(t('Block layout') . ' | Drupal');
       // Select the 'Powered by Drupal' block to be placed.

core/modules/block/src/Tests/BlockUiTest.php

@@ -90,6 +90,10 @@ class BlockUiTest extends WebTestBase {
     \Drupal::service('theme_handler')->install(array('test_theme'));
     $this->drupalGet('admin/structure/block/demo/test_theme');
     $this->assertEscaped('<strong>Test theme</strong>');
+
+    \Drupal::service('theme_handler')->install(['stable']);
+    $this->drupalGet('admin/structure/block/demo/stable');
+    $this->assertResponse(404, 'Hidden themes that are not the default theme are not supported by the block demo screen');
   }
 
   /**
@@ -136,6 +140,28 @@ class BlockUiTest extends WebTestBase {
     $this->drupalGet('admin/structure/block');
     $element = $this->xpath('//tr[contains(@class, :class)]', [':class' => 'region-title-header']);
     $this->assertTrue(!empty($element));
+
+    // Ensure hidden themes do not appear in the UI. Enable another non base
+    // theme and place the local tasks block.
+    $this->assertTrue(\Drupal::service('theme_handler')->themeExists('classy'), 'The classy base theme is enabled');
+    $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header']);
+    \Drupal::service('theme_installer')->install(['stable', 'stark']);
+    $this->drupalGet('admin/structure/block');
+    $theme_handler = \Drupal::service('theme_handler');
+    $this->assertLink($theme_handler->getName('classy'));
+    $this->assertLink($theme_handler->getName('stark'));
+    $this->assertNoLink($theme_handler->getName('stable'));
+
+    $this->drupalGet('admin/structure/block/list/stable');
+    $this->assertResponse(404, 'Placing blocks through UI is not possible for a hidden base theme.');
+
+    \Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable')->save();
+    \Drupal::service('router.builder')->rebuildIfNeeded();
+    $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable']);
+    $this->drupalGet('admin/structure/block');
+    $this->assertLink($theme_handler->getName('stable'));
+    $this->drupalGet('admin/structure/block/list/stable');
+    $this->assertResponse(200, 'Placing blocks through UI is possible for a hidden base theme that is the admin theme.');
   }
 
   /**

core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php

@@ -65,6 +65,14 @@ class NewDefaultThemeBlocksTest extends WebTestBase {
       unset($new_blocks[str_replace($default_theme . '_', $new_theme . '_', $default_block_name)]);
     }
     $this->assertTrue(empty($new_blocks), 'The new theme has exactly the same blocks as the previous default theme.');
+
+    // Install a hidden base theme and ensure blocks are not copied.
+    $base_theme = 'test_basetheme';
+    \Drupal::service('theme_handler')->install([$base_theme]);
+    $new_blocks = $this->container->get('entity.query')->get('block')
+      ->condition('theme', $base_theme)
+      ->execute();
+    $this->assertTrue(empty($new_blocks), 'Installing a hidden base theme does not copy blocks from the default theme.');
   }
 
 }

core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php

@@ -27,7 +27,11 @@ class BlockLocalTasksTest extends LocalTaskIntegrationTestBase {
 
     $themes = array();
     $themes['test_a'] = (object) array(
-      'status' => 0,
+      'status' => 1,
+      'info' => array(
+        'name' => 'test_a',
+        'hidden' => TRUE,
+      ),
     );
     $themes['test_b'] = (object) array(
       'status' => 1,
@@ -45,6 +49,13 @@ class BlockLocalTasksTest extends LocalTaskIntegrationTestBase {
     $theme_handler->expects($this->any())
       ->method('listInfo')
       ->will($this->returnValue($themes));
+    $theme_handler->expects($this->any())
+      ->method('hasUi')
+      ->willReturnMap([
+        ['test_a', FALSE],
+        ['test_b', TRUE],
+        ['test_c', TRUE],
+      ]);
 
     $container = new ContainerBuilder();
     $container->set('config.factory', $config_factory);