Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 07:03:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'rector/rules-symfony' into '147-history-user-scope-job'

Browse Source 
# Conflicts:
#   src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
This commit is contained in:
Julien Fastré
2023-10-16 16:00:40 +00:00
parent 05865521b5 4e13b2ae3a
commit 0c8ecfe493
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
View File

@@ -17,6 +17,7 @@ use Doctrine\ORM\QueryBuilder;
use Exception;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use function array_merge;
/**
@@ -143,10 +144,8 @@ class EntityPersonCRUDController extends CRUDController
/**
* @param mixed $entity
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
protected function onBeforeRedirectAfterSubmission(string $action, $entity, \Symfony\Component\Form\FormInterface $form, Request $request)
protected function onBeforeRedirectAfterSubmission(string $action, $entity, \Symfony\Component\Form\FormInterface $form, Request $request): ?Response
{
$next = $request->request->get('submit', 'save-and-close');

6
src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
View File

@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Repository;
use Chill\MainBundle\Entity\Location;
use Chill\MainBundle\Entity\PostalCode;
use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Entity\User;
@@ -23,6 +24,7 @@ interface AccompanyingPeriodACLAwareRepositoryInterface
/**
* @param array|UserJob[] $jobs
* @param array|Scope[] $services
* @param array|Location[] $administrativeLocations
*/
public function countByUnDispatched(array $jobs, array $services, array $administrativeLocations): int;
@@ -45,10 +47,10 @@ interface AccompanyingPeriodACLAwareRepositoryInterface
/**
* @param array|UserJob[] $jobs if empty, does not take this argument into account
* @param array|Scope[] $services if empty, does not take this argument into account
*
* @param array|Location[] $administrativeLocations
* @return list<AccompanyingPeriod>
*/
public function findByUnDispatched(array $jobs, array $services, array $administrativeAdministrativeLocations, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
public function findByUnDispatched(array $jobs, array $services, array $administrativeLocations, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
/**
* @param array|PostalCode[] $postalCodes