replaced UserInterface with getUser

src/Controller/SongController.php

@@ -7,7 +7,6 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -98,8 +97,9 @@ class SongController extends AbstractController
     /**
      * @Route("/song/{songId}/update", name="song.update")
      */
-    public function songUpdate(Request $request, UserInterface $user, int $songId)
+    public function songUpdate(Request $request, int $songId)
     {
+        $user = $this->getUser();
         $em = $this->getDoctrine()->getManager();
         $data = [];
 
@@ -312,8 +312,9 @@ class SongController extends AbstractController
     /**
      * @Route("/song/{songId}/delete", name="song.delete")
      */
-    public function songDelete(Request $request, UserInterface $user, int $songId)
+    public function songDelete(Request $request, int $songId)
     {
+        $user = $this->getUser();
         $em = $this->getDoctrine()->getManager();
         $data = [];
 

src/Controller/UserController.php

@@ -6,7 +6,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Security\Core\User\UserInterface;
 
 use App\Entity\User;
 use App\Entity\Song;
@@ -16,28 +15,31 @@ class UserController extends AbstractController
     /**
      * @Route("/user/{userId}", name="user.detail")
      */
-    public function userDetail(Request $request, int $userId, UserInterface $user)
+    public function userDetail(Request $request, int $userId)
     {
+        $user = $this->getUser();
         $em = $this->getDoctrine()->getManager();
         $data = [];
 
-        if($user->getId() == $userId) {
-            if($request->request->get('save') == "changeAvatar") {
-                if($request->files->get('newAvatar')) {
-                    $allowedMimeTypes = array("image/jpeg", "image/png");
+        if($user) {
+            if($user->getId() == $userId) {
+                if($request->request->get('save') == "changeAvatar") {
+                    if($request->files->get('newAvatar')) {
+                        $allowedMimeTypes = array("image/jpeg", "image/png");
 
-                    if(in_array($request->files->get('newAvatar')->getMimeType(), $allowedMimeTypes)) {
-                        @unlink($this->getParameter('avatar_path').DIRECTORY_SEPARATOR.$user->getCoverReference());
+                        if(in_array($request->files->get('newAvatar')->getMimeType(), $allowedMimeTypes)) {
+                            @unlink($this->getParameter('avatar_path').DIRECTORY_SEPARATOR.$user->getCoverReference());
 
-                        $user->setCoverReference(uniqid().".png");
-                        rename($request->files->get('newAvatar'), $this->getParameter('avatar_path').DIRECTORY_SEPARATOR.$user->getCoverReference());
+                            $user->setCoverReference(uniqid().".png");
+                            rename($request->files->get('newAvatar'), $this->getParameter('avatar_path').DIRECTORY_SEPARATOR.$user->getCoverReference());
 
-                        $em->persist($user);
-                        $em->flush();
+                            $em->persist($user);
+                            $em->flush();
+                        }
                     }
                 }
             }
-        }
+    }
 
         $resultUser = $em->getRepository(User::class)->findOneBy(array('id' => $userId));
         if(!$resultUser) throw new NotFoundHttpException();

src/Controller/UserSettingsController.php

@@ -7,7 +7,6 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
 use FOS\UserBundle\Model\UserManagerInterface;
 
 use App\Entity\User;
@@ -17,8 +16,9 @@ class UserSettingsController extends AbstractController
     /**
      * @Route("/settings", name="user.settings")
      */
-    public function userSettings(Request $request, UserInterface $user, UserPasswordEncoderInterface $encoder, UserManagerInterface $userManager)
+    public function userSettings(Request $request, UserPasswordEncoderInterface $encoder, UserManagerInterface $userManager)
     {
+        $user = $this->getUser();
         $em = $this->getDoctrine()->getManager();
         $data = [];