Commit 4557d23d authored by catch's avatar catch

Issue #2559597 by Cottser: Clean up uses of Drupal\Core\Render\Element\Markup

parent 8c811242
......@@ -15,7 +15,6 @@
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Controller\ControllerResolverInterface;
use Drupal\Core\Render\Element\Markup;
use Drupal\Core\Template\Attribute;
use Drupal\Core\Theme\ThemeManagerInterface;
use Symfony\Component\HttpFoundation\RequestStack;
......
......@@ -7,7 +7,6 @@
namespace Drupal\Tests\views\Unit\Controller {
use Drupal\Core\Render\Element\Markup;
use Drupal\Core\Render\RenderContext;
use Drupal\Tests\UnitTestCase;
use Drupal\views\Ajax\ViewAjaxResponse;
......@@ -92,13 +91,6 @@ protected function setUp() {
$this->viewAjaxController = new ViewAjaxController($this->viewStorage, $this->executableFactory, $this->renderer, $this->currentPath, $this->redirectDestination);
$element_info_manager = $this->getMock('\Drupal\Core\Render\ElementInfoManagerInterface');
$element_info_manager->expects($this->any())
->method('getInfo')
->with('markup')
->willReturn([
'#pre_render' => [[Markup::class, 'ensureMarkupIsSafe']],
'#defaults_loaded' => TRUE,
]);
$request_stack = new RequestStack();
$request_stack->push(new Request());
$args = [
......
......@@ -13,7 +13,6 @@
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheableDependencyInterface;
use Drupal\Core\Render\Element;
use Drupal\Core\Render\Element\Markup;
use Drupal\Core\Render\SafeString;
use Drupal\Core\Template\Attribute;
......
......@@ -12,7 +12,6 @@
use Drupal\Core\Cache\Context\ContextCacheKeys;
use Drupal\Core\Cache\MemoryBackend;
use Drupal\Core\Render\Element;
use Drupal\Core\Render\Element\Markup;
use Drupal\Core\Render\RenderCache;
use Drupal\Core\Render\Renderer;
use Drupal\Tests\UnitTestCase;
......@@ -123,9 +122,6 @@ protected function setUp() {
case 'link':
$info = ['#theme' => 'link'];
break;
case 'markup':
$info = ['#pre_render' => [[Markup::class, 'ensureMarkupIsSafe']]];
break;
default:
$info = [];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment