Skip to content

Commit 6b9cc64

Browse files
killerwolfdbu
authored andcommitted
Fix symfony3 compatibility
1 parent 588ddbf commit 6b9cc64

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Admin/RouteAdmin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ public function getExportFormats()
143143
protected function configureFieldsForDefaults($dynamicDefaults)
144144
{
145145
$defaults = array(
146-
'_controller' => array('_controller', $textType, array('required' => false)),
147-
'_template' => array('_template', $textType, array('required' => false)),
146+
'_controller' => array('_controller', Sf2CompatUtil::getFormTypeName('text'), array('required' => false)),
147+
'_template' => array('_template', Sf2CompatUtil::getFormTypeName('text'), array('required' => false)),
148148
'type' => array('type', Sf2CompatUtil::getFormTypeName('cmf_routing_route_type'), array(
149149
'empty_value' => '',
150150
'required' => false,

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
2626
"matthiasnoback/symfony-config-test": "^1.3.1",
2727
"phpunit/php-code-coverage": "@stable",
28-
"sonata-project/doctrine-phpcr-admin-bundle": "^1.1|^2.0",
28+
"sonata-project/doctrine-phpcr-admin-bundle": "^1.1",
2929
"symfony/monolog-bundle": "~2.3",
3030
"doctrine/orm": "~2.3",
3131
"doctrine/data-fixtures": "1.*,>=1.0.0-alpha3"

0 commit comments

Comments
 (0)