add compatibility with php8.1
This commit is contained in:
parent
018b0261fc
commit
d8c4349386
|
@ -21,10 +21,10 @@ class SettingAdminController extends AdminController
|
||||||
* @Route("/{page}", name="admin_setting_index", requirements={"page": "\d+"})
|
* @Route("/{page}", name="admin_setting_index", requirements={"page": "\d+"})
|
||||||
*/
|
*/
|
||||||
public function index(
|
public function index(
|
||||||
int $page = 1,
|
|
||||||
RepositoryQuery $query,
|
RepositoryQuery $query,
|
||||||
EventDispatcherInterface $eventDispatcher,
|
EventDispatcherInterface $eventDispatcher,
|
||||||
Request $request
|
Request $request,
|
||||||
|
int $page = 1
|
||||||
): Response {
|
): Response {
|
||||||
$eventDispatcher->dispatch(new SettingEvent(), SettingEvent::INIT_EVENT);
|
$eventDispatcher->dispatch(new SettingEvent(), SettingEvent::INIT_EVENT);
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ class NavigationAdminController extends CrudController
|
||||||
/**
|
/**
|
||||||
* @Route("/admin/site/navigation/{page}", name="admin_site_navigation_index", methods={"GET"}, requirements={"page":"\d+"})
|
* @Route("/admin/site/navigation/{page}", name="admin_site_navigation_index", methods={"GET"}, requirements={"page":"\d+"})
|
||||||
*/
|
*/
|
||||||
public function index(int $page = 1, RepositoryQuery $query, Request $request, Session $session): Response
|
public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
|
||||||
{
|
{
|
||||||
return $this->doIndex($page, $query, $request, $session);
|
return $this->doIndex($page, $query, $request, $session);
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ class NavigationAdminController extends CrudController
|
||||||
/**
|
/**
|
||||||
* @Route("/admin/site/navigation/sort/{page}", name="admin_site_navigation_sort", methods={"POST"}, requirements={"page":"\d+"})
|
* @Route("/admin/site/navigation/sort/{page}", name="admin_site_navigation_sort", methods={"POST"}, requirements={"page":"\d+"})
|
||||||
*/
|
*/
|
||||||
public function sort(int $page = 1, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
|
public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1, ): Response
|
||||||
{
|
{
|
||||||
return $this->doSort($page, $query, $entityManager, $request, $session);
|
return $this->doSort($page, $query, $entityManager, $request, $session);
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ class PageAdminController extends CrudController
|
||||||
/**
|
/**
|
||||||
* @Route("/admin/site/page/{page}", name="admin_site_page_index", methods={"GET"}, requirements={"page":"\d+"})
|
* @Route("/admin/site/page/{page}", name="admin_site_page_index", methods={"GET"}, requirements={"page":"\d+"})
|
||||||
*/
|
*/
|
||||||
public function index(int $page = 1, RepositoryQuery $query, Request $request, Session $session): Response
|
public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
|
||||||
{
|
{
|
||||||
return $this->doIndex($page, $query, $request, $session);
|
return $this->doIndex($page, $query, $request, $session);
|
||||||
}
|
}
|
||||||
|
@ -80,7 +80,7 @@ class PageAdminController extends CrudController
|
||||||
/**
|
/**
|
||||||
* @Route("/admin/site/page/batch/{page}", name="admin_site_page_batch", methods={"POST"}, requirements={"page":"\d+"})
|
* @Route("/admin/site/page/batch/{page}", name="admin_site_page_batch", methods={"POST"}, requirements={"page":"\d+"})
|
||||||
*/
|
*/
|
||||||
public function batch(int $page = 1, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
|
public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
|
||||||
{
|
{
|
||||||
return $this->doBatch($page, $query, $entityManager, $request, $session);
|
return $this->doBatch($page, $query, $entityManager, $request, $session);
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ class UserAdminController extends CrudController
|
||||||
/**
|
/**
|
||||||
* @Route("/admin/user/{page}", name="admin_user_index", methods={"GET"}, requirements={"page":"\d+"})
|
* @Route("/admin/user/{page}", name="admin_user_index", methods={"GET"}, requirements={"page":"\d+"})
|
||||||
*/
|
*/
|
||||||
public function index(int $page = 1, RepositoryQuery $query, Request $request, Session $session): Response
|
public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
|
||||||
{
|
{
|
||||||
return $this->doIndex($page, $query, $request, $session);
|
return $this->doIndex($page, $query, $request, $session);
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,9 @@ class FileUploadType extends AbstractType
|
||||||
'required' => true,
|
'required' => true,
|
||||||
'multiple' => true,
|
'multiple' => true,
|
||||||
'attr' => [
|
'attr' => [
|
||||||
|
'webkitdirectory' => '',
|
||||||
|
'directory' => '',
|
||||||
|
'mozdirectory' => '',
|
||||||
],
|
],
|
||||||
'constraints' => [
|
'constraints' => [
|
||||||
new All([
|
new All([
|
||||||
|
|
|
@ -21,7 +21,7 @@ class <?= $class_name; ?> extends CrudController
|
||||||
/**
|
/**
|
||||||
* @Route("/admin/<?= $route; ?>/{page}", name="admin_<?= $route; ?>_index", methods={"GET"}, requirements={"page":"\d+"})
|
* @Route("/admin/<?= $route; ?>/{page}", name="admin_<?= $route; ?>_index", methods={"GET"}, requirements={"page":"\d+"})
|
||||||
*/
|
*/
|
||||||
public function index(int $page = 1, RepositoryQuery $query, Request $request, Session $session): Response
|
public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
|
||||||
{
|
{
|
||||||
return $this->doIndex($page, $query, $request, $session);
|
return $this->doIndex($page, $query, $request, $session);
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ class <?= $class_name; ?> extends CrudController
|
||||||
/**
|
/**
|
||||||
* @Route("/admin/<?= $route; ?>/sort/{page}", name="admin_<?= $route; ?>_sort", methods={"POST"}, requirements={"page":"\d+"})
|
* @Route("/admin/<?= $route; ?>/sort/{page}", name="admin_<?= $route; ?>_sort", methods={"POST"}, requirements={"page":"\d+"})
|
||||||
*/
|
*/
|
||||||
public function sort(int $page = 1, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
|
public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
|
||||||
{
|
{
|
||||||
return $this->doSort($page, $query, $entityManager, $request, $session);
|
return $this->doSort($page, $query, $entityManager, $request, $session);
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ class <?= $class_name; ?> extends CrudController
|
||||||
/**
|
/**
|
||||||
* @Route("/admin/<?= $route; ?>/batch/{page}", name="admin_<?= $route; ?>_batch", methods={"POST"}, requirements={"page":"\d+"})
|
* @Route("/admin/<?= $route; ?>/batch/{page}", name="admin_<?= $route; ?>_batch", methods={"POST"}, requirements={"page":"\d+"})
|
||||||
*/
|
*/
|
||||||
public function batch(int $page = 1, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
|
public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
|
||||||
{
|
{
|
||||||
return $this->doBatch($page, $query, $entityManager, $request, $session);
|
return $this->doBatch($page, $query, $entityManager, $request, $session);
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,6 +47,9 @@
|
||||||
"doctrine/dbal": {
|
"doctrine/dbal": {
|
||||||
"version": "2.12.1"
|
"version": "2.12.1"
|
||||||
},
|
},
|
||||||
|
"doctrine/deprecations": {
|
||||||
|
"version": "v0.5.3"
|
||||||
|
},
|
||||||
"doctrine/doctrine-bundle": {
|
"doctrine/doctrine-bundle": {
|
||||||
"version": "2.0",
|
"version": "2.0",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
@ -469,6 +472,9 @@
|
||||||
"symfony/orm-pack": {
|
"symfony/orm-pack": {
|
||||||
"version": "v2.1.0"
|
"version": "v2.1.0"
|
||||||
},
|
},
|
||||||
|
"symfony/password-hasher": {
|
||||||
|
"version": "v6.0.2"
|
||||||
|
},
|
||||||
"symfony/phpunit-bridge": {
|
"symfony/phpunit-bridge": {
|
||||||
"version": "5.1",
|
"version": "5.1",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
@ -505,6 +511,9 @@
|
||||||
"symfony/polyfill-php80": {
|
"symfony/polyfill-php80": {
|
||||||
"version": "v1.22.1"
|
"version": "v1.22.1"
|
||||||
},
|
},
|
||||||
|
"symfony/polyfill-php81": {
|
||||||
|
"version": "v1.24.0"
|
||||||
|
},
|
||||||
"symfony/process": {
|
"symfony/process": {
|
||||||
"version": "v5.2.4"
|
"version": "v5.2.4"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue