Merge pull request #9 from webstacknl/feat/version-3

feat: initial setup for version 3 using apiplatform 3.0, symfony 6.2 and php 8.1

Author: darylholling

composer.json

@@ -11,15 +11,15 @@
     }
   ],
   "require": {
-    "php": "^7.4|^8.0",
-    "api-platform/core": "^2.6",
+    "php": "^8.1",
+    "api-platform/core": "^3.0",
     "doctrine/orm": "^2.11",
     "ramsey/uuid-doctrine": "^1.8",
-    "symfony/security-bundle": "^5.4|^6.0",
-    "symfony/serializer": "^5.4|^6.0"
+    "symfony/security-bundle": "^6.2",
+    "symfony/serializer": "^6.2"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.5",
+    "friendsofphp/php-cs-fixer": "^3.14",
     "phpstan/extension-installer": "^1.1",
     "phpstan/phpstan": "^1.2",
     "phpstan/phpstan-doctrine": "^1.0",

src/DependencyInjection/WebstackApiPlatformExtensionsExtension.php

@@ -4,7 +4,6 @@
 
 namespace Webstack\ApiPlatformExtensionsBundle\DependencyInjection;
 
-use Exception;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -13,7 +12,7 @@
 class WebstackApiPlatformExtensionsExtension extends Extension
 {
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function load(array $configs, ContainerBuilder $container): void
     {

src/EventListener/MeListener.php

@@ -4,23 +4,20 @@
 
 namespace Webstack\ApiPlatformExtensionsBundle\EventListener;
 
-use ApiPlatform\Core\Api\FormatMatcher;
-use ApiPlatform\Core\Util\ClassInfoTrait;
+use ApiPlatform\Api\FormatMatcher;
+use ApiPlatform\Util\ClassInfoTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Negotiation\Exception\Exception as NeogationException;
 use Negotiation\Negotiator;
-use ReflectionClass;
-use ReflectionException;
-use RuntimeException;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Webstack\ApiPlatformExtensionsBundle\Util\MimeType\MimeTypeFlattener;
 
@@ -44,7 +41,7 @@ public function __construct(Security $security, EntityManagerInterface $entityMa
     }
 
     /**
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws NonUniqueResultException
      * @throws NoResultException
      * @throws NeogationException
@@ -57,21 +54,24 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
-        if (null === $this->security->getToken()) {
+        if (!$this->security->getToken() instanceof TokenInterface) {
             return;
         }
 
         $user = $this->security->getToken()->getUser();
 
+        if (!$user instanceof UserInterface) {
+            return;
+        }
+
         // League returns a NullUser instance when a non-user (e.g. client_credentials) is authenticated.
         $class = get_class($user);
-        $isUser = $user instanceof UserInterface && $class !== 'League\Bundle\OAuth2ServerBundle\Security\User\NullUser';
 
-        if ($isUser) {
-            if (method_exists($class, 'getId')) {
+        if ('League\Bundle\OAuth2ServerBundle\Security\User\NullUser' !== $class) {
+            if (method_exists($user, 'getId')) {
                 $id = $user->getId();
             } else {
-                throw new RuntimeException(sprintf('Could not determine the user id, class "%s" must have a getId() method', $class));
+                throw new \RuntimeException(sprintf('Could not determine the user id, class "%s" must have a getId() method', $class));
             }
         } else {
             $subject = $this->getSubject($this->security->getToken());
@@ -91,7 +91,7 @@ public function onKernelRequest(RequestEvent $event): void
     }
 
     /**
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws NoResultException
      * @throws NonUniqueResultException
      */
@@ -102,7 +102,7 @@ public function getSubject(TokenInterface $token): object
         $rsm = new ResultSetMappingBuilder($this->entityManager);
         $rsm->addRootEntityFromClassMetadata($class, 'subject');
 
-        $reflectionClass = new ReflectionClass($class);
+        $reflectionClass = new \ReflectionClass($class);
         $class = strtolower($reflectionClass->getShortName());
 
         $query = $this->entityManager->createNativeQuery(sprintf('