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
b619a2c6
Commit
b619a2c6
authored
May 06, 2014
by
webchick
Browse files
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
core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
View file @
b619a2c6
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
namespace
Drupal\rest\Plugin\views\display
;
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\State\StateInterface
;
use
Drupal\Core\Routing\RouteProviderInterface
;
use
Drupal\Core\Routing\RouteProviderInterface
;
use
Drupal\Core\ContentNegotiation
;
use
Drupal\Core\ContentNegotiation
;
...
@@ -99,14 +99,14 @@ class RestExport extends PathPluginBase {
...
@@ -99,14 +99,14 @@ class RestExport extends PathPluginBase {
* The route provider
* The route provider
* @param \Drupal\Core\State\StateInterface $state
* @param \Drupal\Core\State\StateInterface $state
* The state key value store.
* The state key value store.
* @param \Drupal\Core\Form\Form
Builde
rInterface $form_error
* @param \Drupal\Core\Form\Form
Erro
rInterface $form_error
* The form
build
er.
* The form
error help
er.
* @param \Drupal\Core\ContentNegotiation $content_negotiation
* @param \Drupal\Core\ContentNegotiation $content_negotiation
* The content negotiation library.
* The content negotiation library.
* @param \Symfony\Component\HttpFoundation\Request $request
* @param \Symfony\Component\HttpFoundation\Request $request
* The request object.
* 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
);
parent
::
__construct
(
$configuration
,
$plugin_id
,
$plugin_definition
,
$route_provider
,
$state
,
$form_error
);
$this
->
contentNegotiation
=
$content_negotiation
;
$this
->
contentNegotiation
=
$content_negotiation
;
$this
->
request
=
$request
;
$this
->
request
=
$request
;
...
@@ -122,7 +122,7 @@ public static function create(ContainerInterface $container, array $configuratio
...
@@ -122,7 +122,7 @@ public static function create(ContainerInterface $container, array $configuratio
$plugin_definition
,
$plugin_definition
,
$container
->
get
(
'router.route_provider'
),
$container
->
get
(
'router.route_provider'
),
$container
->
get
(
'state'
),
$container
->
get
(
'state'
),
$container
->
get
(
'form_
builde
r'
),
$container
->
get
(
'form_
validato
r'
),
$container
->
get
(
'content_negotiation'
),
$container
->
get
(
'content_negotiation'
),
$container
->
get
(
'request'
)
$container
->
get
(
'request'
)
);
);
...
...
core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php
View file @
b619a2c6
...
@@ -90,8 +90,8 @@ protected function setUp() {
...
@@ -90,8 +90,8 @@ protected function setUp() {
->
getMock
();
->
getMock
();
$container
->
set
(
'plugin.manager.views.style'
,
$style_manager
);
$container
->
set
(
'plugin.manager.views.style'
,
$style_manager
);
$form_
builde
r
=
$this
->
getMock
(
'Drupal\Core\Form\Form
Builde
rInterface'
);
$form_
erro
r
=
$this
->
getMock
(
'Drupal\Core\Form\Form
Erro
rInterface'
);
$container
->
set
(
'form_
builde
r'
,
$form_
builde
r
);
$container
->
set
(
'form_
validato
r'
,
$form_
erro
r
);
\
Drupal
::
setContainer
(
$container
);
\
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
...
@@ -81,7 +81,7 @@ public static function create(ContainerInterface $container, array $configuratio
$plugin_definition
,
$plugin_definition
,
$container
->
get
(
'router.route_provider'
),
$container
->
get
(
'router.route_provider'
),
$container
->
get
(
'state'
),
$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() {
...
@@ -79,10 +79,10 @@ public function testBuildRowEntityList() {
);
);
$route_provider
=
$this
->
getMock
(
'Drupal\Core\Routing\RouteProviderInterface'
);
$route_provider
=
$this
->
getMock
(
'Drupal\Core\Routing\RouteProviderInterface'
);
$state
=
$this
->
getMock
(
'\Drupal\Core\State\StateInterface'
);
$state
=
$this
->
getMock
(
'\Drupal\Core\State\StateInterface'
);
$form_
builde
r
=
$this
->
getMock
(
'Drupal\Core\Form\Form
Builde
rInterface'
);
$form_
erro
r
=
$this
->
getMock
(
'Drupal\Core\Form\Form
Erro
rInterface'
);
$page_display
=
$this
->
getMock
(
'Drupal\views\Plugin\views\display\Page'
,
$page_display
=
$this
->
getMock
(
'Drupal\views\Plugin\views\display\Page'
,
array
(
'initDisplay'
,
'getPath'
),
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
())
$page_display
->
expects
(
$this
->
any
())
->
method
(
'getPath'
)
->
method
(
'getPath'
)
...
...
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