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

# Conflicts:
#   src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
This commit is contained in:
2023-10-16 16:00:40 +00:00
5 changed files with 9 additions and 11 deletions

View File

@@ -863,11 +863,8 @@ class CRUDController extends AbstractController
* * save-and-close: return to index of current crud ;
* * save-and-new: return to new page of current crud ;
* * save-and-view: return to view page of current crud ;
*
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
protected function onBeforeRedirectAfterSubmission(string $action, mixed $entity, FormInterface $form, Request $request)
protected function onBeforeRedirectAfterSubmission(string $action, mixed $entity, FormInterface $form, Request $request): ?Response
{
$next = $request->request->get('submit', 'save-and-close');

View File

@@ -20,7 +20,7 @@ interface UserACLAwareRepositoryInterface
/**
* Find the users reaching the given center and scope, for the given role.
*
* @param array|Center|Center[] $center
* @param array|Center|Center[]|null $center
* @param array|Scope|Scope[]|null $scope
* @param bool $onlyActive true if get only active users
*

View File

@@ -167,7 +167,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
*
* This method is executed before the `setUp` method.
*
* @return \Doctrine\DBAL\Query\QueryBuilder[]
* @return QueryBuilder[]
*/
abstract public function getQueryBuilders();