Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
4557d23d
Commit
4557d23d
authored
Aug 29, 2015
by
catch
Browse files
Issue
#2559597
by Cottser: Clean up uses of Drupal\Core\Render\Element\Markup
parent
8c811242
Changes
4
Hide whitespace changes
Inline
Side-by-side
core/lib/Drupal/Core/Render/Renderer.php
View file @
4557d23d
...
...
@@ -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
;
...
...
core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
View file @
4557d23d
...
...
@@ -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
=
[
...
...
core/tests/Drupal/Tests/Core/Render/RendererTest.php
View file @
4557d23d
...
...
@@ -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
;
...
...
core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
View file @
4557d23d
...
...
@@ -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
=
[];
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment