Merge 6749dc4 into ed644e1

nucleos · Jul 31, 2019 · db80a99 · db80a99
2 parents ed644e1 + 6749dc4
commit db80a99
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 63 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,9 +1,10 @@
-includes:
-    - vendor-bin/phpstan/vendor/jangregor/phpstan-prophecy/src/extension.neon
-
 parameters:
     autoload_files:
         - vendor-bin/test/vendor/autoload.php
 
     ignoreErrors:
+        # PHPUnit
+        -
+            message: '#Property .*::\$.* has no typehint specified.#'
+            path: tests/
 
diff --git a/src/Crawler/AbstractCrawler.php b/src/Crawler/AbstractCrawler.php
@@ -42,7 +42,7 @@ public function __construct(ConnectionInterface $connection)
      */
     final protected function crawl(string $url, array $params = []): ?Crawler
     {
-        if ($content = $this->connection->getPageBody($url, $params)) {
+        if (null !== $content = $this->connection->getPageBody($url, $params)) {
             return new Crawler($content);
         }
 
@@ -115,7 +115,7 @@ final protected function parseUrl(Crawler $node, string $attr = 'href'): ?string
             return null;
         }
 
-        if ($url = $node->attr($attr)) {
+        if (null !== $url = $node->attr($attr)) {
             return preg_replace('/^\//', static::URL_PREFIX.'/', $url);
         }
 
@@ -129,7 +129,7 @@ final protected function parseImage(Crawler $node): ?Image
     {
         $src = $this->parseUrl($node, 'src');
 
-        if (!$src) {
+        if (null === $src) {
             return null;
         }
 

diff --git a/src/Crawler/ArtistEventCrawler.php b/src/Crawler/ArtistEventCrawler.php
@@ -69,26 +69,22 @@ public function getYearCount(string $artist, ?int $year, int $page = 1): int
         $perPage = $this->countListEvents($node);
         $pages   = $this->countListPages($node);
 
-        if ($pages) {
-            $node = $this->crawlUrl($artist, $year, $pages);
+        $node = $this->crawlUrl($artist, $year, $pages);
 
-            if (null === $node) {
-                return $perPage;
-            }
-
-            $count = $this->countListEvents($node);
-
-            return ($pages - 1) * $perPage + $count;
+        if (null === $node) {
+            return $perPage;
         }
 
-        return $perPage;
+        $count = $this->countListEvents($node);
+
+        return ($pages - 1) * $perPage + $count;
     }
 
     private function countListPages(Crawler $node): int
     {
         $pagination = $this->parseString($node->filter('.pagination .pagination-page')->last());
 
-        return $pagination ? (int) preg_replace('/.* of /', '', $pagination) : 1;
+        return null !== $pagination ? (int) preg_replace('/.* of /', '', $pagination) : 1;
     }
 
     private function countListEvents(Crawler $node): int

diff --git a/src/Crawler/EventInfoCrawler.php b/src/Crawler/EventInfoCrawler.php
@@ -57,7 +57,7 @@ private function readArtists(Crawler $node): array
             return new Artist(
                 $this->parseString($node->filter('.grid-items-item-main-text')) ?? '',
                 null,
-                $image ? [$image] : [],
+                null !== $image ? [$image] : [],
                 $this->parseUrl($node->filter('.grid-items-item-main-text a'))
             );
         });

diff --git a/src/Crawler/UserEventCrawler.php b/src/Crawler/UserEventCrawler.php
@@ -71,26 +71,22 @@ public function getYearCount(string $username, ?int $year, int $page = 1): int
         $perPage = $this->countListEvents($node);
         $pages   = $this->countListPages($node);
 
-        if ($pages) {
-            $node = $this->crawlUrl($username, $year, $pages);
+        $node = $this->crawlUrl($username, $year, $pages);
 
-            if (null === $node) {
-                return $perPage;
-            }
-
-            $count = $this->countListEvents($node);
-
-            return ($pages - 1) * $perPage + $count;
+        if (null === $node) {
+            return $perPage;
         }
 
-        return $perPage;
+        $count = $this->countListEvents($node);
+
+        return ($pages - 1) * $perPage + $count;
     }
 
     private function countListPages(Crawler $node): int
     {
         $pagination = $this->parseString($node->filter('.pagination .pages'));
 
-        return $pagination ? (int) preg_replace('/.* of /', '', $pagination) : 1;
+        return null !== $pagination ? (int) preg_replace('/.* of /', '', $pagination) : 1;
     }
 
     private function countListEvents(Crawler $node): int

diff --git a/src/Filter/RangeFilter.php b/src/Filter/RangeFilter.php
@@ -32,8 +32,8 @@ public function __construct(?DateTime $start, ?DateTime $end)
     public function getQuery(string $startKey, string $endKey): array
     {
         return [
-            $startKey => $this->start ? $this->start->getTimestamp() : null,
-            $endKey   => $this->end ? $this->end->getTimestamp() : null,
+            $startKey => null !== $this->start ? $this->start->getTimestamp() : null,
+            $endKey   => null !== $this->end ? $this->end->getTimestamp() : null,
         ];
     }
 }
diff --git a/tests/Filter/RangeFilterTest.php b/tests/Filter/RangeFilterTest.php
@@ -17,7 +17,12 @@ final class RangeFilterTest extends TestCase
 {
     public function testItIsInstantiable(): void
     {
-        static::assertNotNull(new RangeFilter(null, null));
+        $filter = new RangeFilter(null, null);
+
+        static::assertSame([
+            'foo' => null,
+            'bar' => null,
+        ], $filter->getQuery('foo', 'bar'));
     }
 
     public function testGetQuery(): void

diff --git a/tests/Service/AuthServiceTest.php b/tests/Service/AuthServiceTest.php
@@ -17,18 +17,11 @@ final class AuthServiceTest extends TestCase
 {
     private $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->client =  $this->prophesize(ApiClientInterface::class);
     }
 
-    public function testItIsInstantiable(): void
-    {
-        $service = new AuthService($this->client->reveal());
-
-        static::assertNotNull($service);
-    }
-
     public function testCreateSession(): void
     {
         $this->client->signedCall('auth.getSession', [

diff --git a/tests/Service/GeoServiceTest.php b/tests/Service/GeoServiceTest.php
@@ -17,18 +17,11 @@ final class GeoServiceTest extends TestCase
 {
     private $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->client =  $this->prophesize(ApiClientInterface::class);
     }
 
-    public function testItIsInstantiable(): void
-    {
-        $service = new GeoService($this->client->reveal());
-
-        static::assertNotNull($service);
-    }
-
     public function testGetTopArtists(): void
     {
         $rawResponse = <<<'EOD'

diff --git a/tests/Service/LibraryServiceTest.php b/tests/Service/LibraryServiceTest.php
@@ -17,18 +17,11 @@ final class LibraryServiceTest extends TestCase
 {
     private $client;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->client =  $this->prophesize(ApiClientInterface::class);
     }
 
-    public function testItIsInstantiable(): void
-    {
-        $service = new LibraryService($this->client->reveal());
-
-        static::assertNotNull($service);
-    }
-
     public function testGetArtists(): void
     {
         $rawResponse = <<<'EOD'

diff --git a/tests/Session/SessionTest.php b/tests/Session/SessionTest.php
@@ -10,16 +10,10 @@
 namespace Core23\LastFm\Tests\Session;
 
 use Core23\LastFm\Session\Session;
-use Core23\LastFm\Session\SessionInterface;
 use PHPUnit\Framework\TestCase;
 
 final class SessionTest extends TestCase
 {
-    public function testItIsInstantiable(): void
-    {
-        static::assertInstanceOf(SessionInterface::class, new Session('Username', 'key'));
-    }
-
     public function testGetName(): void
     {
         $session = new Session('Username', 'key');

diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -4,7 +4,8 @@
         "jangregor/phpstan-prophecy": "^0.4",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.11",
-        "phpstan/phpstan-phpunit": "^0.11"
+        "phpstan/phpstan-phpunit": "^0.11",
+        "phpstan/phpstan-strict-rules": "^0.11"
     },
     "conflict": {
         "phpunit/phpunit": ">=8.0"