API tweaks, refs #1533

Author: Seldaek

src/Controller/ApiController.php

@@ -26,6 +26,7 @@
 use Composer\Pcre\Preg;
 use Graze\DogStatsD\Client as StatsDClient;
 use Psr\Log\LoggerInterface;
+use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -34,7 +35,6 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -184,14 +184,14 @@ public function updatePackageAction(Request $request, string $githubWebhookSecre
     }
 
     #[Route(path: '/api/packages/{package}', name: 'api_edit_package', requirements: ['package' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?'], defaults: ['_format' => 'json'], methods: ['PUT'])]
-    public function editPackageAction(Request $request, Package $package, ValidatorInterface $validator, StatsDClient $statsd): JsonResponse
+    public function editPackageAction(Request $request, #[MapEntity(mapping: ['package' => 'name'])] Package $package, ValidatorInterface $validator, StatsDClient $statsd): JsonResponse
     {
         $user = $this->findUser($request);
         if (!$user) {
             return new JsonResponse(['status' => 'error', 'message' => 'Missing or invalid username/apiToken in request'], 406);
         }
         if (!$package->getMaintainers()->contains($user)) {
-            throw new AccessDeniedException();
+            return new JsonResponse(['status' => 'error', 'message' => 'You are not allowed to edit this package'], 403);
         }
 
         $statsd->increment('edit_package_api');

src/Controller/PackageController.php

@@ -801,7 +801,7 @@ public function viewPackageVersionAction(Request $req, int $versionId): JsonResp
         return $resp;
     }
 
-    #[Route(path: '/versions/{versionId}/delete', name: 'delete_version', requirements: ['name' => '[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?', 'versionId' => '[0-9]+'], methods: ['DELETE'])]
+    #[Route(path: '/versions/{versionId}', name: 'delete_version', requirements: ['versionId' => '[0-9]+'], methods: ['DELETE'])]
     public function deletePackageVersionAction(Request $req, int $versionId): Response
     {
         $repo = $this->getEM()->getRepository(Version::class);

src/Package/Updater.php

@@ -664,6 +664,7 @@ private function updatePackageReadme(Package $package, ?string $contents): void
             if ($readme) {
                 $this->getEM()->remove($readme);
             }
+
             return;
         }
 

src/Service/GitHubUserMigrationWorker.php

@@ -122,7 +122,7 @@ static function ($hook) {
             ));
             // sort shorter urls first as that should lead us to find the correct one first
             usort($currentHooks, static function ($a, $b) {
-                return strlen($a['config']['url']) - strlen($b['config']['url']);
+                return \strlen($a['config']['url']) - \strlen($b['config']['url']);
             });
 
             $hookData = $this->getGitHubHookData();

tests/Package/UpdaterTest.php

@@ -12,12 +12,8 @@
 
 namespace App\Tests\Package;
 
-use App\Entity\Dependent;
-use App\Entity\DependentRepository;
 use App\Entity\Package;
 use App\Entity\PackageReadme;
-use App\Entity\Version;
-use App\Entity\VersionRepository;
 use App\Model\ProviderManager;
 use App\Model\VersionIdCache;
 use App\Package\Updater;
@@ -30,13 +26,8 @@
 use Composer\Repository\Vcs\GitDriver;
 use Composer\Repository\Vcs\VcsDriverInterface;
 use Composer\Repository\VcsRepository;
-use Doctrine\Bundle\DoctrineBundle\Registry;
-use Doctrine\DBAL\Connection;
-use Doctrine\ORM\EntityManager;
 use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;