fix deprecations: use fqcn instead of 'choices'

This commit is contained in:
nobohan
2018-04-04 15:55:45 +02:00
parent 65e7354437
commit b84ee91652
7 changed files with 100 additions and 92 deletions

View File

@@ -1,20 +1,20 @@
<?php
/*
* Chill is a software for social workers
* Chill is a software for social workers
*
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -27,6 +27,7 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Bundle\TwigBundle\TwigEngine;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
class CustomFieldTitle extends AbstractCustomField
{
@@ -37,7 +38,7 @@ class CustomFieldTitle extends AbstractCustomField
private $requestStack;
/**
*
*
* @var TwigEngine
*/
private $templating;
@@ -54,7 +55,7 @@ class CustomFieldTitle extends AbstractCustomField
$this->templating = $templating;
$this->translatableStringHelper = $translatableStringHelper;
}
public function buildForm(FormBuilderInterface $builder, CustomField $customField)
{
$builder->add($customField->getSlug(), 'custom_field_title', array(
@@ -68,9 +69,9 @@ class CustomFieldTitle extends AbstractCustomField
}
public function render($value, CustomField $customField, $documentType = 'html')
{
{
return $this->templating
->render('ChillCustomFieldsBundle:CustomFieldsRendering:title.html.twig',
->render('ChillCustomFieldsBundle:CustomFieldsRendering:title.html.twig',
array(
'title' => $customField->getName(),
'type' => $customField->getOptions()[self::TYPE]
@@ -92,7 +93,7 @@ class CustomFieldTitle extends AbstractCustomField
{
return 'Title';
}
public function isEmptyValue($value, CustomField $customField)
{
return false;
@@ -100,7 +101,7 @@ class CustomFieldTitle extends AbstractCustomField
public function buildOptionsForm(FormBuilderInterface $builder)
{
return $builder->add(self::TYPE, 'choice',
return $builder->add(self::TYPE, ChoiceType::class,
array(
'choices' => array(
self::TYPE_TITLE => 'Main title',