Merge pull request #13 from 2lenet/improvement/cache-sf6

SF6 Compatibility
2lenet · Nov 2, 2022 · 839c0ee · 839c0ee
2 parents 3da6875 + ca57222
commit 839c0ee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/src/Controller/CredentialManagerController.php b/src/Controller/CredentialManagerController.php
@@ -11,8 +11,8 @@
 use Lle\CredentialBundle\Entity\Group;
 use Lle\CredentialBundle\Entity\GroupRepository;
 use Lle\CredentialBundle\Entity\GroupCredential;
+use Psr\Cache\CacheItemPoolInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
 
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -65,7 +65,7 @@ public function index()
      * @Route("/admin/credential/toggle", name="admin_credential_toggle")
      * @Security("is_granted('ROLE_ADMIN_DROITS')")
      */
-    public function toggle(Request $request, AdapterInterface $cache)
+    public function toggle(Request $request, CacheItemPoolInterface $cache): JsonResponse
     {
         $cache->deleteItem('group_credentials');
         $var = $request->request->get('id');
@@ -76,12 +76,12 @@ public function toggle(Request $request, AdapterInterface $cache)
             $groupObj = $this->em->getRepository(Group::class)->findOneByName($group);
             $credential = $this->em->getRepository(Credential::class)->findOneByRole($cred);
 
-            $group_cred =  new GroupCredential();
+            $group_cred = new GroupCredential();
             $group_cred->setGroupe($groupObj);
             $group_cred->setCredential($credential);
             $group_cred->setAllowed(true);
         } else {
-            $group_cred->setAllowed(! $group_cred->isAllowed());
+            $group_cred->setAllowed(!$group_cred->isAllowed());
         }
 
         $this->em->persist($group_cred);
@@ -94,7 +94,7 @@ public function toggle(Request $request, AdapterInterface $cache)
      * @Route("/admin/credential/toggle_all", name="admin_credential_toggle_all")
      * @Security("is_granted('ROLE_ADMIN_DROITS')")
      */
-    public function toggleAll(Request $request, AdapterInterface $cache)
+    public function toggleAll(Request $request, CacheItemPoolInterface $cache): JsonResponse
     {
         $cache->deleteItem('group_credentials');
         $group = $request->request->getInt('group');
@@ -125,7 +125,7 @@ public function toggleAll(Request $request, AdapterInterface $cache)
         /** @var Credential $credential */
         foreach ($credentials as $credential) {
             if (!array_key_exists($credential->getId(), $existingCredentials)) {
-                $groupCredential =  new GroupCredential();
+                $groupCredential = new GroupCredential();
                 $groupCredential->setGroupe($group);
                 $groupCredential->setCredential($credential);
                 $groupCredential->setAllowed($checked);
@@ -145,7 +145,7 @@ public function toggleAll(Request $request, AdapterInterface $cache)
      * @Route("/admin/credential/allowed_status", name="admin_credential_allowed_status")
      * @Security("is_granted('ROLE_ADMIN_DROITS')")
      */
-    public function allowedStatus(Request $request, AdapterInterface $cache)
+    public function allowedStatus(Request $request, CacheItemPoolInterface $cache): JsonResponse
     {
         $cache->deleteItem("group_credentials");
 
@@ -158,13 +158,13 @@ public function allowedStatus(Request $request, AdapterInterface $cache)
             $groupObj = $this->em->getRepository(Group::class)->findOneByName($group);
             $credential = $this->em->getRepository(Credential::class)->findOneByRole($cred);
 
-            $groupCred =  new GroupCredential();
+            $groupCred = new GroupCredential();
             $groupCred->setGroupe($groupObj);
             $groupCred->setCredential($credential);
             $groupCred->setAllowed(false);
             $groupCred->setStatusAllowed(true);
         } else {
-            $groupCred->setStatusAllowed(! $groupCred->isStatusAllowed());
+            $groupCred->setStatusAllowed(!$groupCred->isStatusAllowed());
         }
 
         $this->em->persist($groupCred);
@@ -177,7 +177,7 @@ public function allowedStatus(Request $request, AdapterInterface $cache)
      * @Route("/admin/credential/allowed_for_status", name="admin_credential_allowed_for_status")
      * @Security("is_granted('ROLE_ADMIN_DROITS')")
      */
-    public function allowedByStatus(Request $request, AdapterInterface $cache)
+    public function allowedByStatus(Request $request, CacheItemPoolInterface $cache): JsonResponse
     {
         $cache->deleteItem("group_credentials");
 
@@ -209,7 +209,7 @@ public function allowedByStatus(Request $request, AdapterInterface $cache)
             $groupCred->setCredential($credential);
             $groupCred->setAllowed(true);
         } else {
-            $groupCred->setAllowed(! $groupCred->isAllowed());
+            $groupCred->setAllowed(!$groupCred->isAllowed());
         }
 
         $this->em->persist($groupCred);

diff --git a/src/Security/CredentialVoter.php b/src/Security/CredentialVoter.php
@@ -2,16 +2,13 @@
 
 namespace Lle\CredentialBundle\Security;
 
-use Lle\CredentialBundle\Model\StatusPropertyInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Lle\CredentialBundle\Entity\Credential;
-use Lle\CredentialBundle\Entity\Group;
 use Lle\CredentialBundle\Entity\GroupCredential;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Psr\Cache\CacheItemPoolInterface;