Merge remote-tracking branch 'origin/master' into 111_exports_suite

This commit is contained in:
Julien Fastré 2022-09-28 15:53:43 +02:00
commit 3feb5115a5
2 changed files with 4 additions and 2 deletions

View File

@ -41,11 +41,13 @@ class PersonDocumentType extends AbstractType
public function __construct( public function __construct(
TranslatableStringHelperInterface $translatableStringHelper, TranslatableStringHelperInterface $translatableStringHelper,
ScopeResolverDispatcher $scopeResolverDispatcher, ScopeResolverDispatcher $scopeResolverDispatcher,
ParameterBagInterface $parameterBag ParameterBagInterface $parameterBag,
CenterResolverDispatcher $centerResolverDispatcher
) { ) {
$this->translatableStringHelper = $translatableStringHelper; $this->translatableStringHelper = $translatableStringHelper;
$this->scopeResolverDispatcher = $scopeResolverDispatcher; $this->scopeResolverDispatcher = $scopeResolverDispatcher;
$this->parameterBag = $parameterBag; $this->parameterBag = $parameterBag;
$this->centerResolverDispatcher = $centerResolverDispatcher;
} }
public function buildForm(FormBuilderInterface $builder, array $options) public function buildForm(FormBuilderInterface $builder, array $options)

View File

@ -126,7 +126,7 @@ class Version20160318111334 extends AbstractMigration
$this->addSql('ALTER TABLE chill_event_participation ' $this->addSql('ALTER TABLE chill_event_participation '
. 'ADD CONSTRAINT FK_4E7768AC217BBB47 ' . 'ADD CONSTRAINT FK_4E7768AC217BBB47 '
. 'FOREIGN KEY (person_id) ' . 'FOREIGN KEY (person_id) '
. 'REFERENCES chill_person_person(id) ' . 'REFERENCES Person (id) '
. 'NOT DEFERRABLE INITIALLY IMMEDIATE'); . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
$this->addSql('ALTER TABLE chill_event_participation ' $this->addSql('ALTER TABLE chill_event_participation '
. 'ADD CONSTRAINT FK_4E7768ACD60322AC ' . 'ADD CONSTRAINT FK_4E7768ACD60322AC '