Merge pull request #773 from heiglandreas/allowNonRepoBadgesToWrokWit…

…houtRepo Remove repo-access when not required
PUGX · Apr 26, 2022 · 5c282e7 · 5c282e7
2 parents 225f812 + 9098c13
commit 5c282e7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/src/Badge/Infrastructure/Package/PackageRepository.php b/src/Badge/Infrastructure/Package/PackageRepository.php
@@ -39,7 +39,7 @@ public function __construct(
      *
      * @throws UnexpectedValueException
      */
-    public function fetchByRepository(string $repository): Package
+    public function fetchByRepository(string $repository, bool $withDefaultBranch = false): Package
     {
         $apiPackage = $this->packagistClient->get($repository);
         if (!$apiPackage instanceof ApiPackage) {
@@ -48,11 +48,15 @@ public function fetchByRepository(string $repository): Package
 
         $repositoryInfo = Repository::createFromRepositoryUrl($apiPackage->getRepository());
 
-        $defaultBranch = $this->clientStrategy->getDefaultBranch($repositoryInfo);
-
         /** @var Package $class */
         $class = self::$packageClass;
 
-        return $class::createFromApi($apiPackage, ['default_branch' => $defaultBranch]);
+        if (true === $withDefaultBranch) {
+            $defaultBranch = $this->clientStrategy->getDefaultBranch($repositoryInfo);
+
+            return $class::createFromApi($apiPackage, ['default_branch' => $defaultBranch]);
+        }
+
+        return $class::createFromApi($apiPackage);
     }
 }
diff --git a/src/Badge/Model/Package.php b/src/Badge/Model/Package.php
@@ -44,7 +44,7 @@ private function __construct(ApiPackage $apiPackage, array $repoGitHubData)
      *
      * @param array{default_branch: string} $repoGitHubData
      */
-    public static function createFromApi(ApiPackage $apiPackage, array $repoGitHubData): self
+    public static function createFromApi(ApiPackage $apiPackage, array $repoGitHubData = ['default_branch' => '']): self
     {
         return new self($apiPackage, $repoGitHubData);
     }

diff --git a/src/Badge/Model/PackageRepositoryInterface.php b/src/Badge/Model/PackageRepositoryInterface.php
@@ -23,5 +23,5 @@ interface PackageRepositoryInterface
      *
      * @throws UnexpectedValueException
      */
-    public function fetchByRepository(string $repository): Package;
+    public function fetchByRepository(string $repository, bool $withDefaultBranch = false): Package;
 }
diff --git a/src/Badge/Model/UseCase/BaseCreatePackagistImage.php b/src/Badge/Model/UseCase/BaseCreatePackagistImage.php
@@ -61,6 +61,11 @@ protected function fetchPackage(string $repository): Package
         return $this->packageRepository->fetchByRepository($repository);
     }
 
+    protected function fetchPackageWithRepo(string $repository): Package
+    {
+        return $this->packageRepository->fetchByRepository($repository, true);
+    }
+
     /**
      * @throws InvalidArgumentException
      */

diff --git a/src/Badge/Model/UseCase/CreateGitAttributesBadge.php b/src/Badge/Model/UseCase/CreateGitAttributesBadge.php
@@ -60,7 +60,7 @@ public function __construct(
     public function createGitAttributesBadge(string $repository, string $format = Badge::DEFAULT_FORMAT, string $style = Badge::DEFAULT_STYLE): CacheableBadge
     {
         try {
-            $package = $this->fetchPackage($repository);
+            $package = $this->fetchPackageWithRepo($repository);
             $repo = \str_replace('.git', '', $package->getRepository());
         } catch (\Exception) {
             return $this->createDefaultBadge($format, $style);