Skip to content
Snippets Groups Projects
Commit 48f5de46 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2425201 by jibran, dawehner: Small cleanup follow from #2414255.

parent 6f814f06
No related branches found
No related tags found
No related merge requests found
......@@ -165,7 +165,7 @@ public function __construct($root, CacheBackendInterface $cache, LockBackendInte
* services which holds the current active theme information.
*
* @param string $theme_name
* (optional) The name of the theme for which to construct the registry.+
* (optional) The name of the theme for which to construct the registry.
*/
protected function init($theme_name = NULL) {
if ($this->initialized) {
......@@ -345,7 +345,7 @@ protected function build() {
/**
* Process a single implementation of hook_theme().
*
* @param $cache
* @param array $cache
* The theme registry that will eventually be cached; It is an associative
* array keyed by theme hooks, whose values are associative arrays
* describing the hook:
......@@ -378,21 +378,20 @@ protected function build() {
* called in aforementioned order and new entries override older ones. For
* example, if a theme hook is both defined by a module and a theme, then
* the definition in the theme will be used.
* @param \stdClass $theme
* The loaded $theme object as returned from
* ThemeHandlerInterface::listInfo().
* @param string $theme
* The actual name of theme, module, etc. that is being processed.
* @param string $path
* The directory where $name is. For example, modules/system or
* themes/bartik.
*
* @see _theme()
* @see \Drupal\Core\Theme\ThemeManagerInterface::render()
* @see hook_theme()
* @see \Drupal\Core\Extension\ThemeHandler::listInfo()
* @see twig_render_template()
*
* @throws \BadFunctionCallException
*/
protected function processExtension(&$cache, $name, $type, $theme, $path) {
protected function processExtension(array &$cache, $name, $type, $theme, $path) {
$result = array();
$hook_defaults = array(
......
......@@ -7,7 +7,6 @@
namespace Drupal\Tests\Core\Theme;
use Drupal\Core\Extension\Extension;
use Drupal\Core\Theme\ActiveTheme;
use Drupal\Core\Theme\Registry;
use Drupal\Tests\UnitTestCase;
......@@ -91,7 +90,6 @@ public function testGetRegistryForModule() {
'extension' => '.twig',
'base_themes' => [],
]));
$this->registry->setBaseThemes(array());
// Include the module so that hook_theme can be called.
include_once $this->root . '/core/modules/system/tests/modules/theme_test/theme_test.module';
......@@ -136,10 +134,6 @@ public function setTheme(ActiveTheme $theme) {
$this->theme = $theme;
}
public function setBaseThemes(array $base_themes) {
$this->baseThemes = $base_themes;
}
protected function init($theme_name = NULL) {
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment