Fix CS

nucleos · Dec 3, 2023 · c5cdb41 · c5cdb41
1 parent d6ad326
commit c5cdb41
Show file tree

Hide file tree

Showing 47 changed files with 197 additions and 216 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,8 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.12.1@9b860214d58c48b5cbe99bdb17914d0eb723c9cd">
-  <file src="tests/bootstrap.php">
-    <UnresolvableInclude occurrences="1">
-      <code>require_once current($files)</code>
-    </UnresolvableInclude>
-  </file>
-</files>
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591"/>
diff --git a/src/Builder/AlbumInfoBuilder.php b/src/Builder/AlbumInfoBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forAlbum(string $artist, string $album): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
         $builder->query['album']  = $album;
@@ -32,7 +32,7 @@ public static function forAlbum(string $artist, string $album): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/AlbumTagsBuilder.php b/src/Builder/AlbumTagsBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forAlbum(string $artist, string $album): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
         $builder->query['album']  = $album;
@@ -32,7 +32,7 @@ public static function forAlbum(string $artist, string $album): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/AlbumTopTagsBuilder.php b/src/Builder/AlbumTopTagsBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forAlbum(string $artist, string $album): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
         $builder->query['album']  = $album;
@@ -32,7 +32,7 @@ public static function forAlbum(string $artist, string $album): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/ArtistInfoBuilder.php b/src/Builder/ArtistInfoBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forArtist(string $artist): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
 
@@ -31,7 +31,7 @@ public static function forArtist(string $artist): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/ArtistTagsBuilder.php b/src/Builder/ArtistTagsBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forArtist(string $artist): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
 
@@ -31,7 +31,7 @@ public static function forArtist(string $artist): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/ArtistTopAlbumsBuilder.php b/src/Builder/ArtistTopAlbumsBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forArtist(string $artist): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
 
@@ -31,7 +31,7 @@ public static function forArtist(string $artist): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/ArtistTopTagsBuilder.php b/src/Builder/ArtistTopTagsBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forArtist(string $artist): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
 
@@ -31,7 +31,7 @@ public static function forArtist(string $artist): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/ArtistTopTracksBuilder.php b/src/Builder/ArtistTopTracksBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forArtist(string $artist): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
 
@@ -31,7 +31,7 @@ public static function forArtist(string $artist): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/ScrobbeBuilder.php b/src/Builder/ScrobbeBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function create(): self
     {
-        return new static();
+        return new self();
     }
 
     public function addTrack(TrackBuilder $builder): self

diff --git a/src/Builder/SimilarArtistBuilder.php b/src/Builder/SimilarArtistBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forArtist(string $artist): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
 
@@ -31,7 +31,7 @@ public static function forArtist(string $artist): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/SimilarTrackBuilder.php b/src/Builder/SimilarTrackBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forTrack(string $artist, string $track): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
         $builder->query['track']  = $track;
@@ -32,7 +32,7 @@ public static function forTrack(string $artist, string $track): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/TrackBuilder.php b/src/Builder/TrackBuilder.php
@@ -24,7 +24,7 @@ private function __construct(array $data)
 
     public static function create(string $artist, string $track, DateTime $date): self
     {
-        return new static([
+        return new self([
             'artist'    => $artist,
             'track'     => $track,
             'timestamp' => $date->getTimestamp(),

diff --git a/src/Builder/TrackInfoBuilder.php b/src/Builder/TrackInfoBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forArtist(string $name): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $name;
 
@@ -31,7 +31,7 @@ public static function forArtist(string $name): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/TrackTagsBuilder.php b/src/Builder/TrackTagsBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forTrack(string $artist, string $track): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
         $builder->query['track']  = $track;
@@ -32,7 +32,7 @@ public static function forTrack(string $artist, string $track): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Builder/TrackTopTagsBuilder.php b/src/Builder/TrackTopTagsBuilder.php
@@ -22,7 +22,7 @@ private function __construct()
 
     public static function forTrack(string $artist, string $track): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['artist'] = $artist;
         $builder->query['track']  = $track;
@@ -32,7 +32,7 @@ public static function forTrack(string $artist, string $track): self
 
     public static function forMbid(string $mbid): self
     {
-        $builder = new static();
+        $builder = new self();
 
         $builder->query['mbid'] = $mbid;
 

diff --git a/src/Connection/ConnectionInterface.php b/src/Connection/ConnectionInterface.php
@@ -23,7 +23,7 @@ interface ConnectionInterface
     /**
      * Calls the API.
      *
-     *@throws ApiException
+     * @throws ApiException
      */
     public function call(string $url, array $params = [], string $method = 'GET'): array;
 

diff --git a/src/Crawler/AbstractCrawler.php b/src/Crawler/AbstractCrawler.php
@@ -46,9 +46,6 @@ final protected function crawl(string $url, array $params = []): ?Crawler
         return null;
     }
 
-    /**
-     * @param DateTimeImmutable $datetime
-     */
     final protected function parseEvent(Crawler $node, DateTimeImmutable $datetime = null): Event
     {
         $eventNode = $node->filter('.events-list-item-event--title a');

diff --git a/src/Crawler/EventListCrawler.php b/src/Crawler/EventListCrawler.php
@@ -69,7 +69,7 @@ function (Crawler $node) use ($datetime): Event {
 
     private function crawlUrl(GeoLocation $location, int $radius, int $page = 1): ?Crawler
     {
-        $url = static::BASE_URL;
+        $url = self::BASE_URL;
 
         return $this->crawl($url, [
             'location_0' => 'Germany',

diff --git a/src/Exception/CrawlException.php b/src/Exception/CrawlException.php
@@ -13,6 +13,4 @@
 
 use Exception;
 
-final class CrawlException extends Exception
-{
-}
+final class CrawlException extends Exception {}
diff --git a/src/Exception/NotFoundException.php b/src/Exception/NotFoundException.php
@@ -13,6 +13,4 @@
 
 use Exception;
 
-final class NotFoundException extends Exception
-{
-}
+final class NotFoundException extends Exception {}
diff --git a/src/Model/Event.php b/src/Model/Event.php
@@ -52,9 +52,6 @@ public function getEventDate(): DateTimeImmutable
         return $this->eventDate;
     }
 
-    /**
-     * @return string
-     */
     public function getUrl(): ?string
     {
         return $this->url;

diff --git a/src/Service/GeoServiceInterface.php b/src/Service/GeoServiceInterface.php
@@ -31,8 +31,7 @@ public function getTopArtists(string $country, int $limit = 50, int $page = 1):
     /**
      * Get the most popular tracks on Last.fm last week by country.
      *
-     * @param string $location
-     * @param int    $limit
+     * @param int $limit
      *
      * @return Song[]
      *

diff --git a/src/Service/TagServiceInterface.php b/src/Service/TagServiceInterface.php
@@ -25,8 +25,6 @@ interface TagServiceInterface
     /**
      * Get the metadata for a tag on Last.fm. Includes biography.
      *
-     * @param string $lang
-     *
      * @throws NotFoundException
      * @throws ApiException
      */

diff --git a/tests/Builder/AlbumInfoBuilderTest.php b/tests/Builder/AlbumInfoBuilderTest.php
@@ -23,7 +23,7 @@ public function testForMbid(): void
         $expected = [
             'mbid' => 'a466c2a2-6517-42fb-a160-1087c3bafd9f',
         ];
-        static::assertSame($expected, $builder->getQuery());
+        self::assertSame($expected, $builder->getQuery());
     }
 
     public function testForAlbum(): void
@@ -34,7 +34,7 @@ public function testForAlbum(): void
             'artist' => 'Slipknot',
             'album'  => 'IOWA',
         ];
-        static::assertSame($expected, $builder->getQuery());
+        self::assertSame($expected, $builder->getQuery());
     }
 
     public function testForUsername(): void
@@ -47,7 +47,7 @@ public function testForUsername(): void
             'mbid'     => 'a466c2a2-6517-42fb-a160-1087c3bafd9f',
             'username' => 'MyUser',
         ];
-        static::assertSame($expected, $builder->getQuery());
+        self::assertSame($expected, $builder->getQuery());
     }
 
     public function testLanguage(): void
@@ -60,7 +60,7 @@ public function testLanguage(): void
             'mbid' => 'a466c2a2-6517-42fb-a160-1087c3bafd9f',
             'lang' => 'DE',
         ];
-        static::assertSame($expected, $builder->getQuery());
+        self::assertSame($expected, $builder->getQuery());
     }
 
     public function testAutocorrect(): void
@@ -73,7 +73,7 @@ public function testAutocorrect(): void
             'mbid'        => 'a466c2a2-6517-42fb-a160-1087c3bafd9f',
             'autocorrect' => 1,
         ];
-        static::assertSame($expected, $builder->getQuery());
+        self::assertSame($expected, $builder->getQuery());
     }
 
     public function testNoAutocorrect(): void
@@ -86,6 +86,6 @@ public function testNoAutocorrect(): void
             'mbid'        => 'a466c2a2-6517-42fb-a160-1087c3bafd9f',
             'autocorrect' => 0,
         ];
-        static::assertSame($expected, $builder->getQuery());
+        self::assertSame($expected, $builder->getQuery());
     }
 }