Fix wrong url for getting tags/releases

Author: Holger Lösken

src/Contracts/GithubRepositoryTypeContract.php

@@ -7,5 +7,4 @@
 interface GithubRepositoryTypeContract extends SourceRepositoryTypeContract
 {
     const GITHUB_API_URL = 'https://api.github.com';
-    const GITHUB_URL = 'https://github.com';
 }

src/SourceRepositoryTypes/GithubRepositoryTypes/GithubTagType.php

@@ -57,7 +57,7 @@ public function getVersionAvailable(string $prepend = '', string $append = ''):
             $response = $this->getRepositoryReleases();
 
             $releaseCollection = collect(json_decode($response->getBody()->getContents()));
-            $version = $prepend.$releaseCollection->first()->name.$append;
+            $version = $prepend.$releaseCollection->first()->tag_name.$append;
         }
 
         return $version;
@@ -83,8 +83,8 @@ public function fetch($version = ''): Release
 
         $release = $this->selectRelease($releases, $version);
 
-        $this->release->setVersion($release->name)
-                      ->setRelease($release->name.'.zip')
+        $this->release->setVersion($release->tag_name)
+                      ->setRelease($release->tag_name.'.zip')
                       ->updateStoragePath()
                       ->setDownloadUrl($release->zipball_url);
 
@@ -101,8 +101,8 @@ public function selectRelease(Collection $collection, string $version)
         $release = $collection->first();
 
         if (! empty($version)) {
-            if ($collection->contains('name', $version)) {
-                $release = $collection->where('name', $version)->first();
+            if ($collection->contains('tag_name', $version)) {
+                $release = $collection->where('tag_name', $version)->first();
             } else {
                 Log::info('No release for version "'.$version.'" found. Selecting latest.');
             }
@@ -115,7 +115,7 @@ protected function getRepositoryReleases(): ResponseInterface
     {
         $url = '/repos/'.$this->config['repository_vendor']
                .'/'.$this->config['repository_name']
-               .'/tags';
+               .'/releases';
 
         $headers = [];
 

src/UpdaterServiceProvider.php

@@ -120,7 +120,7 @@ protected function registerManager()
         $this->app->bind(GithubTagType::class, function (): GithubRepositoryTypeContract {
             return new GithubTagType(
                 config('self-update.repository_types.github'),
-                new Client(['base_uri' => GithubRepositoryTypeContract::GITHUB_URL]),
+                new Client(['base_uri' => GithubRepositoryTypeContract::GITHUB_API_URL]),
                 $this->app->make(UpdateExecutor::class)
             );
         });

tests/Commands/CheckUpdateTest.php

@@ -30,7 +30,7 @@ public function it_can_run_check_update_command_without_new_version_available():
 
         $github->deleteVersionFile();
 
-        config(['self-update.version_installed' => 'v3.5']);
+        config(['self-update.version_installed' => '3.5']);
 
         $this->artisan(CheckForUpdate::class)
              ->expectsOutput('There\'s no new version available.')

tests/Data/releases-tag.json

@@ -118,8 +118,8 @@ public function it_can_get_new_version_available_from_type_tag_without_version_f
 
         Event::fake();
 
-        $this->assertFalse($github->isNewVersionAvailable('v2.7'));
-        $this->assertTrue($github->isNewVersionAvailable('v1.1'));
+        $this->assertFalse($github->isNewVersionAvailable('2.7'));
+        $this->assertTrue($github->isNewVersionAvailable('1.1'));
 
         Event::assertDispatched(UpdateAvailable::class, 1);
         Event::assertDispatched(UpdateAvailable::class, function (UpdateAvailable $e) use ($github) {
@@ -204,8 +204,8 @@ public function it_can_fetch_github_tag_releases_latest(): void
         $release = $github->fetch();
 
         $this->assertInstanceOf(Release::class, $release);
-        $this->assertEquals('v2.6.10', $release->getVersion());
-        $this->assertEquals('v2.6.10.zip',  $release->getRelease());
+        $this->assertEquals('2.6.1', $release->getVersion());
+        $this->assertEquals('2.6.1.zip',  $release->getRelease());
     }
 
     /** @test */
@@ -220,11 +220,11 @@ public function it_can_fetch_github_tag_releases_specific_version(): void
         /** @var GithubTagType $github */
         $github = (resolve(GithubRepositoryType::class))->create();
 
-        $release = $github->fetch('v2.6.7');
+        $release = $github->fetch('2.6.0');
 
         $this->assertInstanceOf(Release::class, $release);
-        $this->assertEquals('v2.6.7', $release->getVersion());
-        $this->assertEquals('v2.6.7.zip',  $release->getRelease());
+        $this->assertEquals('2.6.0', $release->getVersion());
+        $this->assertEquals('2.6.0.zip',  $release->getRelease());
     }
 
     /** @test */
@@ -242,8 +242,8 @@ public function it_can_fetch_github_tag_releases_and_takes_latest_if_version_not
         $release = $github->fetch('v3.22.1');
 
         $this->assertInstanceOf(Release::class, $release);
-        $this->assertEquals('v2.6.10', $release->getVersion());
-        $this->assertEquals('v2.6.10.zip',  $release->getRelease());
+        $this->assertEquals('2.6.1', $release->getVersion());
+        $this->assertEquals('2.6.1.zip',  $release->getRelease());
     }
 
     /** @test */

tests/SourceRepositoryTypes/GithubRepositoryTypeTest.php

@@ -72,8 +72,8 @@ public function it_can_get_new_version_through_updater_manager_available_from_ty
         $repository = $manager->source('');
         $repository->deleteVersionFile();
 
-        $this->assertFalse($repository->isNewVersionAvailable('v2.7'));
-        $this->assertTrue($repository->isNewVersionAvailable('v1.1'));
+        $this->assertFalse($repository->isNewVersionAvailable('2.7'));
+        $this->assertTrue($repository->isNewVersionAvailable('1.1'));
     }
 
     /** @test */