Commit01b71a4

committed

[Form] Removed trigger_error() for deprecations as of 3.0

1 parent81f8c67 commit01b71a4Copy full SHA for 01b71a4

File tree

-12

lines changed

-12

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ public function compile(\Twig_Compiler $compiler)`
`24`	`24`	`parent::compile($compiler);`
`25`	`25`
`26`	`26`	`$compiler->raw(";\n");`
`27`		`-$compiler->write('trigger_error(\'The helper form_enctype(form) is deprecated since version 2.3 and will be removed in 3.0. Use form_start(form) instead.\', E_USER_DEPRECATED)');`
	`27`	`+`
	`28`	`+// Uncomment this as soon as the deprecation note should be shown`
	`29`	`+// $compiler->write('trigger_error(\'The helper form_enctype(form) is deprecated since version 2.3 and will be removed in 3.0. Use form_start(form) instead.\', E_USER_DEPRECATED)');`
`28`	`30`	`}`
`29`	`31`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,8 @@ public function end(FormView $view, array $variables = array())`
`136`	`136`	`*/`
`137`	`137`	`publicfunctionenctype(FormView$view)`
`138`	`138`	`{`
`139`		`-trigger_error('The form helper $view[\'form\']->enctype() is deprecated since version 2.3 and will be removed in 3.0. Use $view[\'form\']->start() instead.',E_USER_DEPRECATED);`
	`139`	`+// Uncomment this as soon as the deprecation note should be shown`
	`140`	`+// trigger_error('The form helper $view[\'form\']->enctype() is deprecated since version 2.3 and will be removed in 3.0. Use $view[\'form\']->start() instead.', E_USER_DEPRECATED);`
`140`	`141`
`141`	`142`	`return$this->renderer->searchAndRenderBlock($view,'enctype');`
`142`	`143`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ public function preBind(FormEvent $event)`
`43`	`43`	`return;`
`44`	`44`	`}`
`45`	`45`
`46`		`-trigger_error('Passing a Request instance to Form::bind() is deprecated since version 2.3 and will be disabled in 3.0. Call Form::process($request) instead.',E_USER_DEPRECATED);`
	`46`	`+// Uncomment this as soon as the deprecation note should be shown`
	`47`	`+// trigger_error('Passing a Request instance to Form::bind() is deprecated since version 2.3 and will be disabled in 3.0. Call Form::process($request) instead.', E_USER_DEPRECATED);`
`47`	`48`
`48`	`49`	`$name =$form->getConfig()->getName();`
`49`	`50`	`$default =$form->getConfig()->getCompound() ?array() :null;`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,6 @@ protected function setUp()`
`32`	`32`	`$this->factory = Forms::createFormFactoryBuilder()`
`33`	`33`	`->addExtensions($this->getExtensions())`
`34`	`34`	`->getFormFactory();`
`35`		`-`
`36`		`-set_error_handler(array('Symfony\Component\Form\Test\DeprecationErrorHandler','handle'));`
`37`		`- }`
`38`		`-`
`39`		`-protectedfunctiontearDown()`
`40`		`- {`
`41`		`-$this->factory =null;`
`42`		`-`
`43`		`-restore_error_handler();`
`44`	`35`	`}`
`45`	`36`
`46`	`37`	`protectedfunctiongetExtensions()`

Comments

(0)