Merge pull request #257 from neildaniels/reintroduce-phpstan

Reintroduce PHPStan

Author: wtfzdotnet

.github/workflows/continuous-integration.yml

@@ -13,7 +13,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
@@ -24,15 +23,6 @@ jobs:
         symfony-deprecations-helper:
           - ""
         include:
-          - php-version: "7.3"
-            deps: "normal"
-
-          - php-version: "7.3"
-            deps: "low"
-
-          - php-version: "7.3"
-            deps: "dev"
-
           - php-version: "7.4"
             deps: "normal"
 

.github/workflows/static-analysis.yml

@@ -0,0 +1,59 @@
+name: Static Analysis
+
+on: ["pull_request", "push"]
+
+jobs:
+  static-analysis-phpstan:
+    name: "PHPStan"
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.4"
+          - "8.0"
+          - "8.1"
+
+    steps:
+      - name: "Checkout code"
+        uses: "actions/checkout@v3"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+          tools: cs2pr
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v2"
+        with:
+          php_version: "${{ matrix.php-version }}"
+
+      - name: "Run PHPStan"
+        run: "vendor/bin/phpstan analyse --error-format=checkstyle --no-progress | cs2pr"
+
+#   static-analysis-psalm:
+#     name: "Psalm"
+#     runs-on: "ubuntu-latest"
+#
+#     strategy:
+#       matrix:
+#         php-version:
+#           - "7.4"
+#
+#     steps:
+#       - name: "Checkout code"
+#         uses: "actions/checkout@v2"
+#
+#       - name: "Install PHP"
+#         uses: "shivammathur/setup-php@v2"
+#         with:
+#           coverage: "none"
+#           php-version: "${{ matrix.php-version }}"
+#
+#       - name: "Install dependencies with Composer"
+#         uses: "ramsey/composer-install@v1"
+#
+#       - name: "Run a static analysis with vimeo/psalm"
+#         run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc)"

.github/workflows/static-analysis.yml.bak

@@ -8,3 +8,4 @@ composer.lock
 .phpunit.result.cache
 examples/
 examples/var/
+phpstan.neon$

.gitignore

@@ -53,7 +53,7 @@
         "squizlabs/php_codesniffer": "^3.5.8",
         "symfony/cache": ">=4.4 || ^5 || ^6",
         "symfony/event-dispatcher": ">=4.4 || ^5 || ^6",
-        "phpstan/phpstan": "^0.12.18",
+        "phpstan/phpstan": "^1.8.1",
         "phpunit/phpunit": ">=8.5.23 || ^9.3",
         "php-http/guzzle7-adapter": "^0.1",
         "monolog/monolog": ">=1.11.0",
@@ -77,5 +77,10 @@
         "php-http/cache-plugin": "When making use of cache, you need to install this plugin.",
         "psr/simple-cache-implementation": "If you wish to enable caching features, provide an PSR-16 cache."
     },
-    "type": "library"
+    "type": "library",
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
 }

composer.json

@@ -102,6 +102,8 @@ public function validateRequestTokenWithLogin($requestToken, $username, $passwor
             if ($e->getCode() == 401) {
                 throw new UnauthorizedRequestTokenException("The request token has not been validated yet.");
             }
+
+            return null;
         }
         //@codeCoverageIgnoreEnd
     }
@@ -128,6 +130,8 @@ public function getNewSession($requestToken)
             if ($e->getCode() == 401) {
                 throw new UnauthorizedRequestTokenException("The request token has not been validated yet.");
             }
+
+            return null;
             //@codeCoverageIgnoreEnd
         }
     }

lib/Tmdb/Api/Authentication.php

@@ -289,11 +289,13 @@ public function rateTvShow($id, $rating)
      * Get the alternative titles for a specific show ID.
      *
      * @param integer $id
+     * @param array $parameters
+     * @param array $headers
      * @return mixed
      */
-    public function getAlternativeTitles($id)
+    public function getAlternativeTitles($id, array $parameters = [], array $headers = [])
     {
-        return $this->get('tv/' . $id . '/alternative_titles');
+        return $this->get('tv/' . $id . '/alternative_titles', $parameters, $headers);
     }
 
     /**

lib/Tmdb/Api/Tv.php

@@ -264,9 +264,9 @@ public function getGuestSessionToken(): ?GuestSessionToken
 
     /**
      * @param GuestSessionToken|null $guestSessionToken
-     * @return $this
+     * @return self
      */
-    public function setGuestSessionToken(GuestSessionToken $guestSessionToken): Client
+    public function setGuestSessionToken(?GuestSessionToken $guestSessionToken): Client
     {
         $this->options['guest_session_token'] = $guestSessionToken;
 

lib/Tmdb/Client.php

@@ -63,7 +63,7 @@ public function getSubject(): AbstractModel
 
     /**
      * @param AbstractModel $subject
-     * @return $this
+     * @return self
      */
     public function setSubject(AbstractModel $subject): HydrationEvent
     {
@@ -82,7 +82,7 @@ public function getData(): array
 
     /**
      * @param array $data
-     * @return $this
+     * @return self
      */
     public function setData(array $data = []): HydrationEvent
     {
@@ -109,7 +109,7 @@ public function getLastRequest(): ?RequestInterface
 
     /**
      * @param RequestInterface|null $lastRequest
-     * @return $this
+     * @return self
      */
     public function setLastRequest(RequestInterface $lastRequest = null): HydrationEvent
     {
@@ -128,7 +128,7 @@ public function getLastResponse(): ?ResponseInterface
 
     /**
      * @param ResponseInterface|null $lastResponse
-     * @return $this
+     * @return self
      */
     public function setLastResponse(ResponseInterface $lastResponse = null): HydrationEvent
     {

lib/Tmdb/Event/HydrationEvent.php

@@ -32,7 +32,7 @@ class LogHydrationListener
     private $logger;
 
     /**
-     * @var HttpMessageFormatterInterface
+     * @var HydrationFormatterInterface
      */
     private $formatter;