jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

upgraded FosUserBundle and Symfony 4.3 (#1005)

Browse Source
This commit is contained in:
Kevin Papst
2019-08-02 16:52:30 +02:00
committed by GitHub
parent 614a50ce0b
commit e11a2a6089
57 changed files with 1577 additions and 1184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controller/ActivityController.php
View File

@@ -197,7 +197,7 @@ class ActivityController extends AbstractController
protected function renderActivityForm(Activity $activity, Request $request)
{
$event = new ActivityMetaDefinitionEvent($activity);
$this->dispatcher->dispatch(ActivityMetaDefinitionEvent::class, $event);
$this->dispatcher->dispatch($event, ActivityMetaDefinitionEvent::class);
$editForm = $this->createEditForm($activity);
$editForm->handleRequest($request);

2
src/Controller/CustomerController.php
View File

@@ -206,7 +206,7 @@ class CustomerController extends AbstractController
protected function renderCustomerForm(Customer $customer, Request $request)
{
$event = new CustomerMetaDefinitionEvent($customer);
$this->dispatcher->dispatch(CustomerMetaDefinitionEvent::class, $event);
$this->dispatcher->dispatch($event, CustomerMetaDefinitionEvent::class);
$editForm = $this->createEditForm($customer);

5
src/Controller/DashboardController.php
View File

@@ -88,10 +88,7 @@ class DashboardController extends AbstractController
$event->addSection($row);
}
$this->eventDispatcher->dispatch(
DashboardEvent::DASHBOARD,
$event
);
$this->eventDispatcher->dispatch($event, DashboardEvent::DASHBOARD);
$sections = $event->getSections();

6
src/Controller/ProfileController.php
View File

@@ -183,7 +183,7 @@ class ProfileController extends AbstractController
{
// we need to prepare the user preferences, which is done via an EventSubscriber
$event = new PrepareUserEvent($profile);
$this->dispatcher->dispatch(PrepareUserEvent::PREPARE, $event);
$this->dispatcher->dispatch($event, PrepareUserEvent::PREPARE);
$original = [];
foreach ($profile->getPreferences() as $preference) {
@@ -288,7 +288,7 @@ class ProfileController extends AbstractController
{
// we need to prepare the user preferences, which is done via an EventSubscriber
$event = new PrepareUserEvent($user);
$this->dispatcher->dispatch(PrepareUserEvent::PREPARE, $event);
$this->dispatcher->dispatch($event, PrepareUserEvent::PREPARE);
return $this->createForm(
UserPreferencesForm::class,
@@ -343,7 +343,7 @@ class ProfileController extends AbstractController
UserPasswordType::class,
$user,
[
'validation_groups' => ['passwordUpdate'],
'validation_groups' => ['PasswordUpdate'],
'action' => $this->generateUrl('user_profile_password', ['username' => $user->getUsername()]),
'method' => 'POST'
]

2
src/Controller/ProjectController.php
View File

@@ -195,7 +195,7 @@ class ProjectController extends AbstractController
protected function renderProjectForm(Project $project, Request $request)
{
$event = new ProjectMetaDefinitionEvent($project);
$this->dispatcher->dispatch(ProjectMetaDefinitionEvent::class, $event);
$this->dispatcher->dispatch($event, ProjectMetaDefinitionEvent::class);
$editForm = $this->createEditForm($project);
$editForm->handleRequest($request);

2
src/Controller/SystemConfigurationController.php
View File

@@ -169,7 +169,7 @@ class SystemConfigurationController extends AbstractController
$types = $this->getConfigurationTypes();
$event = new SystemConfigurationEvent($types);
$this->eventDispatcher->dispatch(SystemConfigurationEvent::CONFIGURE, $event);
$this->eventDispatcher->dispatch($event, SystemConfigurationEvent::CONFIGURE);
foreach ($event->getConfigurations() as $configs) {
foreach ($configs->getConfiguration() as $config) {

4
src/Controller/TimesheetAbstractController.php
View File

@@ -138,7 +138,7 @@ abstract class TimesheetAbstractController extends AbstractController
protected function edit(Timesheet $entry, Request $request, string $renderTemplate)
{
$event = new TimesheetMetaDefinitionEvent($entry);
$this->dispatcher->dispatch(TimesheetMetaDefinitionEvent::class, $event);
$this->dispatcher->dispatch($event, TimesheetMetaDefinitionEvent::class);
$editForm = $this->getEditForm($entry, $request->get('page'));
$editForm->handleRequest($request);
@@ -196,7 +196,7 @@ abstract class TimesheetAbstractController extends AbstractController
}
$event = new TimesheetMetaDefinitionEvent($entry);
$this->dispatcher->dispatch(TimesheetMetaDefinitionEvent::class, $event);
$this->dispatcher->dispatch($event, TimesheetMetaDefinitionEvent::class);
$mode = $this->getTrackingMode();
$mode->create($entry, $request);