Vincent пре 3 година
родитељ
комит
b5b08fb0d9

+ 1 - 1
src/Entity/Education/CriteriaNotation.php

@@ -44,7 +44,7 @@ class CriteriaNotation
     private Collection $educationNotationCriteriaConfigs;
 
     #[ORM\Column]
-    #[Assert\Choice(callback: ['\AppBundle\Enum\Education\TypeCriteriaEnum', 'toArray'], message: 'invalid-type')]
+    #[Assert\Choice(callback: ['\App\Enum\Education\TypeCriteriaEnum', 'toArray'], message: 'invalid-type')]
     private string $type;
 
     #[ORM\Column]

+ 1 - 1
src/Entity/Person/Person.php

@@ -131,7 +131,7 @@ class Person implements UserInterface, PasswordAuthenticatedUserInterface
         return (string) $this->username;
     }
 
-    public function getUserIdentifier(): ?string
+    public function getUserIdentifier(): string
     {
         return (string) $this->username;
     }

+ 2 - 1
src/Repository/Access/AccessRepository.php

@@ -11,6 +11,7 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * @method Access|null find($id, $lockMode = null, $lockVersion = null)
@@ -44,7 +45,7 @@ class AccessRepository extends ServiceEntityRepository implements UserLoaderInte
      * @throws \Doctrine\ORM\OptimisticLockException
      * @throws \Doctrine\ORM\TransactionRequiredException
      */
-    public function loadUserByIdentifier($identifier): mixed
+    public function loadUserByIdentifier($identifier): ?UserInterface
     {
         if($this->requestStack->getMainRequest()->headers->get(self::HTTP_X_SWITCH_USER) == $identifier)
             return $this->getEntityManager()->find(Access::class, $identifier);

+ 2 - 1
src/Repository/Person/PersonRepository.php

@@ -7,6 +7,7 @@ use App\Entity\Person\Person;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
@@ -26,7 +27,7 @@ final class PersonRepository extends ServiceEntityRepository implements Password
     /**
      * Used to upgrade (rehash) the user's password automatically over time.
      */
-    public function upgradePassword(UserInterface $user, string $newEncodedPassword): void
+    public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newEncodedPassword): void
     {
         if (!$user instanceof Person) {
             throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));

+ 3 - 4
src/Serializer/DefaultNormalizer.php

@@ -32,10 +32,9 @@ final class DefaultNormalizer implements NormalizerInterface, DenormalizerInterf
         return $this->decorated->supportsNormalization($data, $format);
     }
 
-    public function normalize($object, $format = null, array $context = [])
+    public function normalize($object, $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
     {
-        $data = $this->decorated->normalize($object, $format, $context);
-        return $data;
+        return $this->decorated->normalize($object, $format, $context);
     }
 
     public function supportsDenormalization($data, $type, $format = null): bool
@@ -43,7 +42,7 @@ final class DefaultNormalizer implements NormalizerInterface, DenormalizerInterf
         return $this->decorated->supportsDenormalization($data, $type, $format);
     }
 
-    public function denormalize($data, $class, $format = null, array $context = [])
+    public function denormalize($data, $class, $format = null, array $context = []): mixed
     {
         $entity = $this->decorated->denormalize($data, $class, $format, $context);
 

+ 0 - 2
tests/Service/Cron/UI/ConsoleUITest.php

@@ -24,8 +24,6 @@ class ConsoleUITest extends TestCase
     public function setUp(): void
     {
         $this->output = $this->getMockBuilder(OutputInterface::class)->disableOriginalConstructor()->getMock();
-
-        $this->progressBar = $this->getMockBuilder(MockableProgressBar::class)->disableOriginalConstructor()->getMockForAbstractClass();
     }
 
     public function testPrint(): void