diff --git a/core/Controller/Setting/SettingAdminController.php b/core/Controller/Setting/SettingAdminController.php index e719b01..afcb82e 100644 --- a/core/Controller/Setting/SettingAdminController.php +++ b/core/Controller/Setting/SettingAdminController.php @@ -21,10 +21,10 @@ class SettingAdminController extends AdminController * @Route("/{page}", name="admin_setting_index", requirements={"page": "\d+"}) */ public function index( - int $page = 1, RepositoryQuery $query, EventDispatcherInterface $eventDispatcher, - Request $request + Request $request, + int $page = 1 ): Response { $eventDispatcher->dispatch(new SettingEvent(), SettingEvent::INIT_EVENT); diff --git a/core/Controller/Site/NavigationAdminController.php b/core/Controller/Site/NavigationAdminController.php index ce1bf54..ca7af07 100644 --- a/core/Controller/Site/NavigationAdminController.php +++ b/core/Controller/Site/NavigationAdminController.php @@ -23,7 +23,7 @@ class NavigationAdminController extends CrudController /** * @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); } @@ -79,7 +79,7 @@ class NavigationAdminController extends CrudController /** * @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); } diff --git a/core/Controller/Site/PageAdminController.php b/core/Controller/Site/PageAdminController.php index b4945aa..cb0a794 100644 --- a/core/Controller/Site/PageAdminController.php +++ b/core/Controller/Site/PageAdminController.php @@ -24,7 +24,7 @@ class PageAdminController extends CrudController /** * @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); } @@ -80,7 +80,7 @@ class PageAdminController extends CrudController /** * @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); } diff --git a/core/Controller/User/UserAdminController.php b/core/Controller/User/UserAdminController.php index 59ee4f1..7fdeea9 100644 --- a/core/Controller/User/UserAdminController.php +++ b/core/Controller/User/UserAdminController.php @@ -22,7 +22,7 @@ class UserAdminController extends CrudController /** * @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); } diff --git a/core/Form/FileManager/FileUploadType.php b/core/Form/FileManager/FileUploadType.php index fec3fd0..989660b 100644 --- a/core/Form/FileManager/FileUploadType.php +++ b/core/Form/FileManager/FileUploadType.php @@ -21,6 +21,9 @@ class FileUploadType extends AbstractType 'required' => true, 'multiple' => true, 'attr' => [ + 'webkitdirectory' => '', + 'directory' => '', + 'mozdirectory' => '', ], 'constraints' => [ new All([ diff --git a/core/Resources/maker/controller/CrudController.tpl.php b/core/Resources/maker/controller/CrudController.tpl.php index 6a97eb8..fad6f7c 100644 --- a/core/Resources/maker/controller/CrudController.tpl.php +++ b/core/Resources/maker/controller/CrudController.tpl.php @@ -21,7 +21,7 @@ class extends CrudController /** * @Route("/admin//{page}", name="admin__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); } @@ -61,7 +61,7 @@ class extends CrudController /** * @Route("/admin//sort/{page}", name="admin__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); } @@ -69,7 +69,7 @@ class extends CrudController /** * @Route("/admin//batch/{page}", name="admin__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); } diff --git a/src/Controller/Blog/CategoryAdminController.php b/src/Controller/Blog/CategoryAdminController.php index 7f0a132..d8793a3 100644 --- a/src/Controller/Blog/CategoryAdminController.php +++ b/src/Controller/Blog/CategoryAdminController.php @@ -68,7 +68,7 @@ class CategoryAdminController extends CrudController /** * @Route("/{page}", name="admin_blog_category_index", 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); } @@ -126,7 +126,7 @@ class CategoryAdminController extends CrudController /** * @Route("/admin/blog_category/batch/{page}", name="admin_blog_category_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); } diff --git a/src/Controller/Blog/CommentAdminController.php b/src/Controller/Blog/CommentAdminController.php index 17ead21..769fde3 100644 --- a/src/Controller/Blog/CommentAdminController.php +++ b/src/Controller/Blog/CommentAdminController.php @@ -70,7 +70,7 @@ class CommentAdminController extends CrudController /** * @Route("/{page}", name="admin_blog_comment_index", 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); } @@ -110,7 +110,7 @@ class CommentAdminController extends CrudController /** * @Route("/admin/blog_comment/batch/{page}", name="admin_blog_comment_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); } diff --git a/src/Controller/Blog/PostAdminController.php b/src/Controller/Blog/PostAdminController.php index 80e38c5..af83300 100644 --- a/src/Controller/Blog/PostAdminController.php +++ b/src/Controller/Blog/PostAdminController.php @@ -87,7 +87,7 @@ class PostAdminController extends CrudController /** * @Route("/{page}", name="admin_blog_post_index", 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); } @@ -149,7 +149,7 @@ class PostAdminController extends CrudController /** * @Route("/admin/blog_post/batch/{page}", name="admin_blog_post_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); } diff --git a/src/Controller/StlMeshAdminController.php b/src/Controller/StlMeshAdminController.php index 739dacf..0ef36a2 100644 --- a/src/Controller/StlMeshAdminController.php +++ b/src/Controller/StlMeshAdminController.php @@ -21,7 +21,7 @@ class StlMeshAdminController extends CrudController /** * @Route("/admin/stl_mesh/{page}", name="admin_stl_mesh_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); } @@ -61,7 +61,7 @@ class StlMeshAdminController extends CrudController /** * @Route("/admin/stl_mesh/sort/{page}", name="admin_stl_mesh_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); } @@ -69,7 +69,7 @@ class StlMeshAdminController extends CrudController /** * @Route("/admin/stl_mesh/batch/{page}", name="admin_stl_mesh_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); } diff --git a/symfony.lock b/symfony.lock index aaf8b98..fcf9ac8 100644 --- a/symfony.lock +++ b/symfony.lock @@ -50,6 +50,9 @@ "doctrine/dbal": { "version": "2.12.1" }, + "doctrine/deprecations": { + "version": "v0.5.3" + }, "doctrine/doctrine-bundle": { "version": "2.0", "recipe": { @@ -484,6 +487,9 @@ "symfony/orm-pack": { "version": "v2.1.0" }, + "symfony/password-hasher": { + "version": "v6.0.2" + }, "symfony/phpunit-bridge": { "version": "5.1", "recipe": { @@ -520,6 +526,9 @@ "symfony/polyfill-php80": { "version": "v1.22.1" }, + "symfony/polyfill-php81": { + "version": "v1.24.0" + }, "symfony/process": { "version": "v5.2.4" },