Merge pull request #98 from johnzuk/feature/php8.0-support

Add PHP8.0 support
johnzuk · Dec 4, 2020 · edb4112 · edb4112
2 parents d4c023a + dff8681
commit edb4112
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 
 allow_failures:
   php: nightly

diff --git a/composer.json b/composer.json
@@ -11,16 +11,16 @@
     }
   ],
   "require": {
-    "php" : "^7.1",
+    "php" : "^7.1|^8.0",
     "ext-soap": "*",
     "ext-simplexml": "*",
     "ext-json": "*"
   },
   "require-dev": {
-    "phpstan/phpstan-shim": "^0.11",
     "phpunit/phpunit": "^7.0 | ^8.0",
     "squizlabs/php_codesniffer": "^3.4",
-    "friendsofphp/php-cs-fixer": "^2.11"
+    "friendsofphp/php-cs-fixer": "^2.11",
+    "phpstan/phpstan": "^0.12.58"
   },
   "autoload":{
     "psr-4": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,2 +1,7 @@
 parameters:
     reportUnmatchedIgnoredErrors: false
+    checkMissingIterableValueType: false
+    excludes_analyse:
+    	- src/GusApi/Client/SoapClient.php
+    ignoreErrors:
+        - '#Method GusApi\\Client\\GusApiClient::call\(\) has no return typehint specified#'
diff --git a/src/GusApi/Client/GusApiClient.php b/src/GusApi/Client/GusApiClient.php
@@ -203,7 +203,7 @@ public function setHttpOptions(array $options): void
         ]);
     }
 
-    protected function call(string $functionName, $arguments, ?string $sid = null)
+    protected function call(string $functionName, array $arguments, ?string $sid = null)
     {
         $action = SoapActionMapper::getAction($functionName);
         $soapHeaders = $this->getRequestHeaders($action, $this->location);

diff --git a/src/GusApi/GusApi.php b/src/GusApi/GusApi.php
@@ -397,7 +397,7 @@ public function getSessionStatus(): int
      *
      * @throws \InvalidArgumentException
      */
-    protected function checkIdentifiersCount(array $identifiers)
+    protected function checkIdentifiersCount(array $identifiers): void
     {
         if (\count($identifiers) > self::MAX_IDENTIFIERS) {
             throw new \InvalidArgumentException(\sprintf(

diff --git a/tests/Integration/GusApiTest.php b/tests/Integration/GusApiTest.php
@@ -46,11 +46,11 @@ public function testGetByInvalidNipAndGetMessage()
         $this->expectException(NotFoundException::class);
 
         try {
-            self::$apiClient->getByNip('0123456789');
+            self::$apiClient->getByNip('0123456700');
         } finally {
             $this->assertSame(1, self::$apiClient->getSessionStatus());
-            $this->assertSame('Nie znaleziono podmiotów.', self::$apiClient->getMessage());
-            $this->assertSame(4, self::$apiClient->getMessageCode());
+            $this->assertSame('', self::$apiClient->getMessage());
+            $this->assertSame(0, self::$apiClient->getMessageCode());
         }
     }