Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
301
Merge Requests
301
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
b619a2c6
Commit
b619a2c6
authored
May 06, 2014
by
webchick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2241827
follow-up by tim.plunkett, sun: Switch from form builder to new form validator.
parent
0828fa9e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
.../rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
+5
-5
core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php
...odules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php
+2
-2
core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
.../lib/Drupal/views/Plugin/views/display/PathPluginBase.php
+1
-1
core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListBuilderTest.php
...ws_ui/tests/Drupal/views_ui/Tests/ViewListBuilderTest.php
+2
-2
No files found.
core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
View file @
b619a2c6
...
...
@@ -7,7 +7,7 @@
namespace
Drupal\rest\Plugin\views\display
;
use
Drupal\Core\Form\Form
Builde
rInterface
;
use
Drupal\Core\Form\Form
Erro
rInterface
;
use
Drupal\Core\State\StateInterface
;
use
Drupal\Core\Routing\RouteProviderInterface
;
use
Drupal\Core\ContentNegotiation
;
...
...
@@ -99,14 +99,14 @@ class RestExport extends PathPluginBase {
* The route provider
* @param \Drupal\Core\State\StateInterface $state
* The state key value store.
* @param \Drupal\Core\Form\Form
Builde
rInterface $form_error
* The form
build
er.
* @param \Drupal\Core\Form\Form
Erro
rInterface $form_error
* The form
error help
er.
* @param \Drupal\Core\ContentNegotiation $content_negotiation
* The content negotiation library.
* @param \Symfony\Component\HttpFoundation\Request $request
* The request object.
*/
public
function
__construct
(
array
$configuration
,
$plugin_id
,
$plugin_definition
,
RouteProviderInterface
$route_provider
,
StateInterface
$state
,
Form
Builde
rInterface
$form_error
,
ContentNegotiation
$content_negotiation
,
Request
$request
)
{
public
function
__construct
(
array
$configuration
,
$plugin_id
,
$plugin_definition
,
RouteProviderInterface
$route_provider
,
StateInterface
$state
,
Form
Erro
rInterface
$form_error
,
ContentNegotiation
$content_negotiation
,
Request
$request
)
{
parent
::
__construct
(
$configuration
,
$plugin_id
,
$plugin_definition
,
$route_provider
,
$state
,
$form_error
);
$this
->
contentNegotiation
=
$content_negotiation
;
$this
->
request
=
$request
;
...
...
@@ -122,7 +122,7 @@ public static function create(ContainerInterface $container, array $configuratio
$plugin_definition
,
$container
->
get
(
'router.route_provider'
),
$container
->
get
(
'state'
),
$container
->
get
(
'form_
builde
r'
),
$container
->
get
(
'form_
validato
r'
),
$container
->
get
(
'content_negotiation'
),
$container
->
get
(
'request'
)
);
...
...
core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php
View file @
b619a2c6
...
...
@@ -90,8 +90,8 @@ protected function setUp() {
->
getMock
();
$container
->
set
(
'plugin.manager.views.style'
,
$style_manager
);
$form_
builder
=
$this
->
getMock
(
'Drupal\Core\Form\FormBuilde
rInterface'
);
$container
->
set
(
'form_
builder'
,
$form_builde
r
);
$form_
error
=
$this
->
getMock
(
'Drupal\Core\Form\FormErro
rInterface'
);
$container
->
set
(
'form_
validator'
,
$form_erro
r
);
\
Drupal
::
setContainer
(
$container
);
...
...
core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
View file @
b619a2c6
...
...
@@ -81,7 +81,7 @@ public static function create(ContainerInterface $container, array $configuratio
$plugin_definition
,
$container
->
get
(
'router.route_provider'
),
$container
->
get
(
'state'
),
$container
->
get
(
'form_
builde
r'
)
$container
->
get
(
'form_
validato
r'
)
);
}
...
...
core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListBuilderTest.php
View file @
b619a2c6
...
...
@@ -79,10 +79,10 @@ public function testBuildRowEntityList() {
);
$route_provider
=
$this
->
getMock
(
'Drupal\Core\Routing\RouteProviderInterface'
);
$state
=
$this
->
getMock
(
'\Drupal\Core\State\StateInterface'
);
$form_
builder
=
$this
->
getMock
(
'Drupal\Core\Form\FormBuilde
rInterface'
);
$form_
error
=
$this
->
getMock
(
'Drupal\Core\Form\FormErro
rInterface'
);
$page_display
=
$this
->
getMock
(
'Drupal\views\Plugin\views\display\Page'
,
array
(
'initDisplay'
,
'getPath'
),
array
(
array
(),
'default'
,
$display_manager
->
getDefinition
(
'page'
),
$route_provider
,
$state
,
$form_
builde
r
)
array
(
array
(),
'default'
,
$display_manager
->
getDefinition
(
'page'
),
$route_provider
,
$state
,
$form_
erro
r
)
);
$page_display
->
expects
(
$this
->
any
())
->
method
(
'getPath'
)
...
...
Write
Preview
Markdown
is supported
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