Code style fixes

Author: codedmonkey

src/Controller/ApiController.php

@@ -17,7 +17,6 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Stamp\TransportNamesStamp;
@@ -79,13 +78,13 @@ public function packageMetadata(string $packageName): Response
         $basePackageName = u($packageName)->trimSuffix('~dev')->toString();
 
         if (null === $package = $this->findPackage($basePackageName)) {
-            throw new NotFoundHttpException();
+            throw $this->createNotFoundException();
         }
 
         $this->messenger->dispatch(new UpdatePackage($package->getId()));
 
         if (!$this->providerManager->exists($packageName)) {
-            throw new NotFoundHttpException();
+            throw $this->createNotFoundException();
         }
 
         return new BinaryFileResponse($this->providerManager->path($packageName), headers: ['Content-Type' => 'application/json']);
@@ -105,26 +104,26 @@ public function packageMetadata(string $packageName): Response
     public function packageDistribution(string $packageName, string $packageVersion, string $reference, string $type): Response
     {
         if (!$this->getParameter('dirigent.dist_mirroring.enabled')) {
-            throw new NotFoundHttpException();
+            throw $this->createNotFoundException();
         }
 
         if (!$this->distributionResolver->exists($packageName, $packageVersion, $reference, $type)) {
             if (null === $package = $this->packageRepository->findOneBy(['name' => $packageName])) {
-                throw new NotFoundHttpException();
+                throw $this->createNotFoundException();
             }
 
             if (null === $version = $this->versionRepository->findOneBy(['package' => $package, 'normalizedVersion' => $packageVersion])) {
-                throw new NotFoundHttpException();
+                throw $this->createNotFoundException();
             }
 
             if ($version->isDevelopment() && !$this->getParameter('dirigent.dist_mirroring.dev_packages')) {
-                throw new NotFoundHttpException();
+                throw $this->createNotFoundException();
             }
 
             $this->messenger->dispatch(new UpdatePackage($package->getId()));
 
             if (!$this->distributionResolver->resolve($version, $reference, $type)) {
-                throw new NotFoundHttpException();
+                throw $this->createNotFoundException();
             }
         }
 

src/Doctrine/Entity/Package.php

@@ -59,7 +59,7 @@ class Package
     #[ORM\Column(nullable: true)]
     private ?string $remoteId = null;
 
-    #[ORM\Column(type: Types::STRING, enumType: PackageFetchStrategy::class, nullable: true)]
+    #[ORM\Column(type: Types::STRING, nullable: true, enumType: PackageFetchStrategy::class)]
     private PackageFetchStrategy|string|null $fetchStrategy = null;
 
     #[ORM\ManyToOne]

src/EasyAdmin/PackagePaginator.php

@@ -10,14 +10,12 @@
 
 class PackagePaginator implements EntityPaginatorInterface
 {
-    private ?int $currentPage = null;
-    private ?int $pageSize = null;
-    private ?int $rangeSize = null;
-    private ?int $rangeEdgeSize = null;
-    private $results;
-    private $numResults;
-    private ?int $rangeFirstResultNumber = null;
-    private ?int $rangeLastResultNumber = null;
+    private int $currentPage;
+    private int $pageSize;
+    private int $rangeSize;
+    private int $rangeEdgeSize;
+    private array $results;
+    private int $numResults;
 
     public function __construct(
         private readonly UrlGeneratorInterface $router,
@@ -33,18 +31,16 @@ public function paginate(PaginatorDto $paginatorDto, QueryBuilder $queryBuilder)
         $this->rangeEdgeSize = $paginatorDto->getRangeEdgeSize();
         $this->currentPage = max(1, $paginatorDto->getPageNumber());
         $firstResult = ($this->currentPage - 1) * $this->pageSize;
-        $this->rangeFirstResultNumber = $this->pageSize * ($this->currentPage - 1) + 1;
-        $this->rangeLastResultNumber = $this->rangeFirstResultNumber + $this->pageSize - 1;
+        $rangeFirstResultNumber = $this->pageSize * ($this->currentPage - 1) + 1;
 
         $countQueryBuilder = clone $queryBuilder;
         $this->numResults = $countQueryBuilder
             ->select('COUNT(package.id)')
             ->getQuery()
             ->getSingleScalarResult();
 
-        if ($this->rangeFirstResultNumber > $this->numResults) {
+        if ($rangeFirstResultNumber > $this->numResults) {
             $this->results = [];
-            $this->rangeLastResultNumber = $this->numResults;
 
             return $this;
         }
@@ -57,9 +53,6 @@ public function paginate(PaginatorDto $paginatorDto, QueryBuilder $queryBuilder)
             ->getResult();
 
         $this->results = $results;
-        if ($this->rangeLastResultNumber > $this->numResults) {
-            $this->rangeLastResultNumber = $this->numResults;
-        }
 
         return $this;
     }