refactor: update request method to accept Method enum; simplify code

Author: roxblnfk

src/Module/Repository/Internal/GitHub/Api/Client.php

@@ -6,6 +6,7 @@
 
 use Internal\DLoad\Module\Config\Schema\GitHub;
 use Internal\DLoad\Module\HttpClient\Factory as HttpFactory;
+use Internal\DLoad\Module\HttpClient\Method;
 use Internal\DLoad\Module\Repository\Internal\GitHub\Exception\GitHubRateLimitException;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface;
@@ -41,12 +42,12 @@ public function __construct(
     }
 
     /**
-     * @param non-empty-string $method
+     * @param Method|non-empty-string $method
      * @param array<string, string> $headers
      * @throws GitHubRateLimitException
      * @throws ClientExceptionInterface
      */
-    public function request(string $method, UriInterface $uri, array $headers = []): ResponseInterface
+    public function request(Method|string $method, string|UriInterface $uri, array $headers = []): ResponseInterface
     {
         $request = $this->httpFactory->request($method, $uri, $headers + $this->defaultHeaders);
 

src/Module/Repository/Internal/GitHub/Api/RepositoryApi.php

@@ -5,6 +5,7 @@
 namespace Internal\DLoad\Module\Repository\Internal\GitHub\Api;
 
 use Internal\DLoad\Module\HttpClient\Factory as HttpFactory;
+use Internal\DLoad\Module\HttpClient\Method;
 use Internal\DLoad\Module\Repository\Internal\GitHub\Api\Response\ReleaseInfo;
 use Internal\DLoad\Module\Repository\Internal\GitHub\Api\Response\RepositoryInfo;
 use Internal\DLoad\Module\Repository\Internal\GitHub\Exception\GitHubRateLimitException;
@@ -45,17 +46,13 @@ public function __construct(
     }
 
     /**
-     * @param non-empty-string $method
+     * @param Method|non-empty-string $method
      * @param array<string, string> $headers
      * @throws GitHubRateLimitException
      * @throws ClientExceptionInterface
      */
-    public function request(string $method, string|UriInterface $uri, array $headers = []): ResponseInterface
+    public function request(Method|string $method, string|UriInterface $uri, array $headers = []): ResponseInterface
     {
-        if (\is_string($uri)) {
-            $uri = $this->httpFactory->uri($uri);
-        }
-
         return $this->client->request($method, $uri, $headers);
     }
 
@@ -65,10 +62,7 @@ public function request(string $method, string|UriInterface $uri, array $headers
      */
     public function getRepository(): RepositoryInfo
     {
-        $response = $this->client->request(
-            'GET',
-            $this->httpFactory->uri(\sprintf(self::URL_REPOSITORY, $this->repositoryPath)),
-        );
+        $response = $this->request(Method::Get, \sprintf(self::URL_REPOSITORY, $this->repositoryPath));
 
         /** @var array{
          *     name: string,
@@ -150,8 +144,8 @@ public function getReleases(int $page = 1): Paginator
      */
     private function releasesRequest(int $page): ResponseInterface
     {
-        return $this->client->request(
-            'GET',
+        return $this->request(
+            Method::Get,
             $this->httpFactory->uri(
                 \sprintf(self::URL_RELEASES, $this->repositoryPath),
                 ['page' => $page],

src/Module/Repository/Internal/GitHub/GitHubAsset.php

@@ -6,6 +6,7 @@
 
 use Internal\DLoad\Module\Common\Architecture;
 use Internal\DLoad\Module\Common\OperatingSystem;
+use Internal\DLoad\Module\HttpClient\Method;
 use Internal\DLoad\Module\Repository\Internal\Asset;
 use Internal\DLoad\Module\Repository\Internal\GitHub\Api\Response\AssetInfo;
 use Internal\DLoad\Module\Repository\Internal\GitHub\Api\RepositoryApi;
@@ -58,7 +59,7 @@ public static function fromDTO(
      */
     public function download(?\Closure $progress = null): \Generator
     {
-        $response = $this->api->request('GET', $this->getUri());
+        $response = $this->api->request(Method::Get, $this->getUri());
 
         $body = $response->getBody();
         $size = $body->getSize();

src/Module/Repository/Internal/GitHub/GitHubRelease.php

@@ -4,14 +4,12 @@
 
 namespace Internal\DLoad\Module\Repository\Internal\GitHub;
 
-use Composer\Semver\VersionParser;
 use Internal\DLoad\Module\Repository\Collection\AssetsCollection;
 use Internal\DLoad\Module\Repository\Internal\GitHub\Api\Response\ReleaseInfo;
 use Internal\DLoad\Module\Repository\Internal\GitHub\Api\RepositoryApi;
 use Internal\DLoad\Module\Repository\Internal\Release;
 use Internal\DLoad\Module\Version\Version;
 use Internal\DLoad\Service\Destroyable;
-use Psr\Http\Client\ClientExceptionInterface;
 
 /**
  * GitHub Release class representing a release in a GitHub repository.
@@ -25,7 +23,6 @@ final class GitHubRelease extends Release implements Destroyable
      * @param non-empty-string $name
      */
     private function __construct(
-        private readonly RepositoryApi $api,
         GitHubRepository $repository,
         string $name,
         Version $version,
@@ -38,9 +35,8 @@ public static function fromDTO(
         GitHubRepository $repository,
         ReleaseInfo $dto,
     ): self {
-        $name = self::getTagName($dto->name, $dto->tagName);
         $version = Version::fromVersionString($dto->tagName);
-        $result = new self($api, $repository, $name, $version);
+        $result = new self($repository, $dto->name, $version);
 
         $result->assets = AssetsCollection::create(static function () use ($api, $result, $dto): \Generator {
             foreach ($dto->assets as $assetDTO) {
@@ -51,21 +47,6 @@ public static function fromDTO(
         return $result;
     }
 
-    /**
-     * @throws ClientExceptionInterface
-     */
-    public function getConfig(): string
-    {
-        $configUrl = \vsprintf('https://raw.githubusercontent.com/%s/%s/.rr.yaml', [
-            $this->getRepository()->getName(),
-            $this->getVersion(),
-        ]);
-
-        $response = $this->api->request('GET', $configUrl);
-
-        return $response->getBody()->__toString();
-    }
-
     public function destroy(): void
     {
         $this->assets === null or $this->assets->map(
@@ -74,24 +55,4 @@ public function destroy(): void
 
         unset($this->assets, $this->repository);
     }
-
-    /**
-     * Returns pretty-formatted tag (release) name.
-     *
-     * @note The return value is "pretty", but that does not mean that the tag physically exists.
-     */
-    private static function getTagName(string $name, string $tagName): string
-    {
-        $parser = new VersionParser();
-
-        try {
-            return $parser->normalize($tagName);
-        } catch (\Throwable) {
-            try {
-                return $parser->normalize($name);
-            } catch (\Throwable) {
-                return 'dev-' . $tagName;
-            }
-        }
-    }
 }

src/Module/Repository/Internal/Release.php

@@ -4,7 +4,6 @@
 
 namespace Internal\DLoad\Module\Repository\Internal;
 
-use Composer\Semver\VersionParser;
 use Internal\DLoad\Module\Repository\Collection\AssetsCollection;
 use Internal\DLoad\Module\Repository\ReleaseInterface;
 use Internal\DLoad\Module\Repository\Repository;
@@ -17,25 +16,17 @@
  */
 abstract class Release implements ReleaseInterface
 {
-    /**
-     * Normalized release name.
-     *
-     * @var non-empty-string
-     */
-    protected string $name;
-
     protected AssetsCollection $assets;
 
     /**
-     * @param non-empty-string $name
+     * @param non-empty-string $name Release name.
      */
     public function __construct(
         protected Repository $repository,
-        string $name,
+        protected string $name,
         protected Version $version,
         iterable $assets = [],
     ) {
-        $this->name = $this->simplifyReleaseName($name);
         $this->assets = AssetsCollection::create($assets);
     }
 
@@ -63,21 +54,4 @@ public function satisfies(Constraint $constraint): bool
     {
         return $constraint->isSatisfiedBy($this->version);
     }
-
-    /**
-     * @param non-empty-string $name
-     * @return non-empty-string
-     */
-    private function simplifyReleaseName(string $name): string
-    {
-        $version = (new VersionParser())->normalize($name);
-
-        $parts = \explode('-', $version);
-        $number = \substr($parts[0], 0, -2);
-
-        return isset($parts[1])
-            ? $number . '-' . $parts[1]
-            : $number
-        ;
-    }
 }