Cleanup code using phpstan

Author: GrahamCampbell

.gitattributes

@@ -1,9 +1,12 @@
 * text=auto
 
 /tests export-ignore
+/vendor-bin export-ignore
 /.gitattributes export-ignore
 /.github export-ignore
 /.gitignore export-ignore
+/phpstan-baseline.neon export-ignore
+/phpstan.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
 /CHANGELOG.md export-ignore
 /README.md export-ignore

.github/workflows/static.yml

@@ -0,0 +1,23 @@
+name: Tests
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 4 * * 1'
+
+jobs:
+  analyse:
+
+    runs-on: ubuntu-latest
+
+    name: PHPStan
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Composer
+      run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:$7.4-base update -n -o
+    - name: Install PHPStan
+      run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:$7.4-base bin phpstan update -n -o
+    - name: Run PHPUnit
+      run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint vendor/bin/phpstan registry.gitlab.com/grahamcampbell/php:$7.4-cli analyse

.github/workflows/tests.yml

@@ -20,6 +20,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Run Composer
-      run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:${{ matrix.php }}-base install --prefer-dist -n -o
+      run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint composer registry.gitlab.com/grahamcampbell/php:${{ matrix.php }}-base update --prefer-dist -n -o
     - name: Run PHPUnit
       run: docker run --rm -w /data -v ${{ github.workspace }}:/data --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:${{ matrix.php }}-cli

.gitignore

@@ -1,4 +1,5 @@
 .phpunit.result.cache
 composer.lock
+phpstan.neon
 phpunit.xml
 vendor

composer.json

@@ -21,7 +21,8 @@
         "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "graham-campbell/analyzer": "^2.4",
+        "bamarni/composer-bin-plugin": "^1.4.1",
+        "graham-campbell/analyzer": "^3.0",
         "phpunit/phpunit": "^8.5|^9.0",
         "php-http/guzzle6-adapter": "^2.0",
         "php-http/mock-client": "^1.3"
@@ -38,7 +39,5 @@
     },
     "config": {
         "preferred-install": "dist"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }

phpstan-baseline.neon

@@ -0,0 +1,27 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Anonymous function should have native return typehint \"string\"\\.$#"
+			count: 1
+			path: src/Api/AbstractApi.php
+
+		-
+			message: "#^Anonymous function should have native return typehint \"bool\"\\.$#"
+			count: 1
+			path: src/HttpClient/Message/ResponseMediator.php
+
+		-
+			message: "#^Anonymous function should have native return typehint \"Psr\\\\Http\\\\Message\\\\ResponseInterface\"\\.$#"
+			count: 1
+			path: src/HttpClient/Plugin/ExceptionThrower.php
+
+		-
+			message: "#^Variable method call on Bitbucket\\\\Api\\\\ApiInterface\\.$#"
+			count: 1
+			path: src/ResultPager.php
+
+		-
+			message: "#^Offset string does not exist on array\\|null\\.$#"
+			count: 1
+			path: src/ResultPager.php
+

phpstan.neon.dist

@@ -0,0 +1,8 @@
+includes:
+	- phpstan-baseline.neon
+
+parameters:
+    level: max
+    paths:
+        - src
+    checkMissingIterableValueType: false

src/Api/AbstractApi.php

@@ -15,6 +15,7 @@
 
 use Bitbucket\Exception\InvalidArgumentException;
 use Bitbucket\HttpClient\Message\ResponseMediator;
+use Bitbucket\JsonArray;
 use Http\Client\Common\HttpMethodsClientInterface;
 
 /**
@@ -125,7 +126,7 @@ protected function pureGet(string $path, array $params = [], array $headers = []
             $params['pagelen'] = $this->perPage;
         }
 
-        if ($params) {
+        if (count($params) === 0) {
             $path .= '?'.http_build_query($params);
         }
 
@@ -147,7 +148,7 @@ protected function post(string $path, array $params = [], array $headers = [])
     {
         $body = self::createJsonBody($params);
 
-        if ($body) {
+        if ($body !== null) {
             $headers = self::addJsonContentType($headers);
         }
 
@@ -187,7 +188,7 @@ protected function put(string $path, array $params = [], array $headers = [])
     {
         $body = self::createJsonBody($params);
 
-        if ($body) {
+        if ($body !== null) {
             $headers = self::addJsonContentType($headers);
         }
 
@@ -227,7 +228,7 @@ protected function delete(string $path, array $params = [], array $headers = [])
     {
         $body = self::createJsonBody($params);
 
-        if ($body) {
+        if ($body !== null) {
             $headers = self::addJsonContentType($headers);
         }
 
@@ -255,16 +256,16 @@ protected function deleteRaw(string $path, $body = null, array $headers = [])
     /**
      * Build a URL path from the given parts.
      *
-     * @param string[] $parts
+     * @param string ...$parts
      *
      * @throws \Bitbucket\Exception\InvalidArgumentException
      *
      * @return string
      */
     protected static function buildPath(string ...$parts)
     {
-        $parts = array_map(function (string $part) {
-            if (!$part) {
+        $parts = array_map(function (string $part)  {
+            if ($part === '') {
                 throw new InvalidArgumentException('Missing required parameter.');
             }
 
@@ -295,17 +296,19 @@ private static function computePath(string $path)
      */
     private static function createJsonBody(array $params)
     {
-        if ($params) {
-            return json_encode($params);
+        if (count($params) === 0) {
+            return JsonArray::encode($params);
         }
+
+        return null;
     }
 
     /**
      * Add the JSON content type to the headers if one is not already present.
      *
-     * @param array $headers
+     * @param array<string,string> $headers
      *
-     * @return array
+     * @return array<string,string>
      */
     private static function addJsonContentType(array $headers)
     {

src/Api/Addon.php

@@ -70,7 +70,7 @@ public function users()
     /**
      * Build the addon path from the given parts.
      *
-     * @param string[] $parts
+     * @param string ...$parts
      *
      * @throws \Bitbucket\Exception\InvalidArgumentException
      *

src/Api/Addon/Linkers.php

@@ -64,7 +64,7 @@ public function values(string $linker)
     /**
      * Build the linkers path from the given parts.
      *
-     * @param string[] $parts
+     * @param string ...$parts
      *
      * @throws \Bitbucket\Exception\InvalidArgumentException
      *