Permalink
Browse files

make compatible with Symfony 2.0

  • Loading branch information...
1 parent 6b27508 commit 76c4502de9f45b1838de85ce31f895c361a5cde4 @trsteel88 committed May 6, 2012
Showing with 20 additions and 20 deletions.
  1. +18 −18 DependencyInjection/Configuration.php
  2. +2 −2 Form/CkeditorType.php
@@ -31,7 +31,7 @@ public function getConfigTreeBuilder()
->defaultValue(array(
'strip_js', 'strip_css', 'strip_comments'
))
- ->setInfo("Default data transformers for the submitted html.")
+ #->setInfo("Default data transformers for the submitted html.")
->end()
->end()
->children()
@@ -41,83 +41,83 @@ public function getConfigTreeBuilder()
'basicstyles', 'paragraph', 'links', '/',
'insert', 'styles', 'tools'
))
- ->setInfo("The default toolbar displayed on the editor.")
+ #->setInfo("The default toolbar displayed on the editor.")
->end()
->end()
->children()
->variableNode('toolbar_groups')
->defaultValue(array())
- ->setInfo("Groups of icons in the editor.")
+ #->setInfo("Groups of icons in the editor.")
->end()
->end()
->children()
->booleanNode('startup_outline_blocks')
->defaultTrue()
- ->setInfo("Whether to automaticaly enable the \"show block\" command when the editor loads.")
+ #->setInfo("Whether to automaticaly enable the \"show block\" command when the editor loads.")
->end()
->end()
->children()
->scalarNode('ui_color')
->defaultNull()
- ->setInfo("The base user interface color to be used by the editor. Must be a hex.")
- ->setExample("#AADC6E")
+ #->setInfo("The base user interface color to be used by the editor. Must be a hex.")
+ #->setExample("#AADC6E")
->end()
->end()
->children()
->scalarNode('width')
->defaultNull()
- ->setInfo("The editor UI outer width. Must be an integer or percentage.")
- ->setExample("850")
+ #->setInfo("The editor UI outer width. Must be an integer or percentage.")
+ #->setExample("850")
->end()
->end()
->children()
->scalarNode('height')
->defaultNull()
- ->setInfo("The height of the editing area (that includes the editor content).")
- ->setExample("600")
+ #>setInfo("The height of the editing area (that includes the editor content).")
+ #->setExample("600")
->end()
->end()
->children()
->scalarNode('language')
->defaultNull()
- ->setInfo("The user interface language localization to use.")
- ->setExample("en-au")
+ #->setInfo("The user interface language localization to use.")
+ #->setExample("en-au")
->end()
->end()
->children()
->scalarNode('filebrowser_browse_url')
->defaultNull()
- ->setInfo("The location of an external file browser that should be launched when the Browse Server button is pressed.")
+ #->setInfo("The location of an external file browser that should be launched when the Browse Server button is pressed.")
->end()
->end()
->children()
->scalarNode('filebrowser_upload_url')
->defaultNull()
- ->setInfo("The location of the script that handles file uploads.")
+ #->setInfo("The location of the script that handles file uploads.")
->end()
->end()
->children()
->scalarNode('filebrowser_image_browse_url')
->defaultNull()
- ->setInfo("The location of an external file browser that should be launched when the Browse Server button is pressed in the Image dialog window.")
+ #->setInfo("The location of an external file browser that should be launched when the Browse Server button is pressed in the Image dialog window.")
->end()
->end()
->children()
->scalarNode('filebrowser_image_upload_url')
->defaultNull()
- ->setInfo("The location of the script that handles file uploads in the Image dialog window.")
+ #->setInfo("The location of the script that handles file uploads in the Image dialog window.")
->end()
->end()
->children()
->scalarNode('filebrowser_flash_browse_url')
->defaultNull()
- ->setInfo("The location of an external file browser that should be launched when the Browse Server button is pressed in the Flash dialog window.")
+ #->setInfo("The location of an external file browser that should be launched when the Browse Server button is pressed in the Flash dialog window.")
->end()
->end()
->children()
->scalarNode('filebrowser_flash_upload_url')
->defaultNull()
- ->setInfo("The location of the script that handles file uploads in the Flash dialog window.")
+ #->setInfo("The location of the script that handles file uploads in the Flash dialog window.")
->end()
->end()
;
View
@@ -113,7 +113,7 @@ public function buildView(FormView $view, FormInterface $form)
/**
* {@inheritdoc}
*/
- public function getDefaultOptions()
+ public function getDefaultOptions(array $options = array())
{
return array(
'required' => false,
@@ -141,7 +141,7 @@ public function getDefaultOptions()
*
* @return array The allowed option values
*/
- public function getAllowedOptionValues()
+ public function getAllowedOptionValues(array $options = array())
{
return array(
'required' => array(false),

0 comments on commit 76c4502

Please sign in to comment.