Updated deps and applied code style (#1)

Author: loevgaard

.github/workflows/build.yaml

@@ -0,0 +1,37 @@
+name: build
+on:
+    push: ~
+    pull_request: ~
+    schedule:
+        - cron: 5 8 * * 3
+jobs:
+    checks:
+        name: PHP ${{ matrix.php-versions }}
+        runs-on: ${{ matrix.operating-system }}
+        strategy:
+            fail-fast: false
+            matrix:
+                operating-system: [ubuntu-latest]
+                php-versions: ['7.2', '7.3', '7.4']
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v1
+            -   name: Setup PHP, with composer and extensions
+                uses: shivammathur/setup-php@master
+                with:
+                    php-version: ${{ matrix.php-versions }}
+                    extensions: mbstring
+            -   name: Install Composer dependencies
+                run: composer update --no-progress --no-suggest --prefer-dist --no-interaction
+            -   name: Validate composer
+                run: composer validate --strict
+            -   name: Check composer normalized
+                run: composer normalize --dry-run
+            -   name: Check style
+                run: composer check-style
+            -   name: Static analysis
+                run: composer analyse
+            -   name: Run phpspec
+                run: composer phpspec
+            -   name: Run phpunit
+                run: composer phpunit

.travis.yml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Joachim Løvgaard
+Copyright (c) 2020 Joachim Løvgaard
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -3,7 +3,7 @@
 [![Latest Version][ico-version]][link-packagist]
 [![Latest Unstable Version][ico-unstable-version]][link-packagist]
 [![Software License][ico-license]](LICENSE)
-[![Build Status][ico-travis]][link-travis]
+[![Build Status][ico-github-actions]][link-github-actions]
 [![Quality Score][ico-code-quality]][link-code-quality]
 
 A PHP SDK for the [PostNord API](https://developer.postnord.com/api).
@@ -61,9 +61,9 @@ $client->get('findNearestByAddress.json', [
 [ico-version]: https://poser.pugx.org/setono/post-nord-php-sdk/v/stable
 [ico-unstable-version]: https://poser.pugx.org/setono/post-nord-php-sdk/v/unstable
 [ico-license]: https://poser.pugx.org/setono/post-nord-php-sdk/license
-[ico-travis]: https://travis-ci.com/Setono/post-nord-php-sdk.svg?branch=master
-[ico-code-quality]: https://img.shields.io/scrutinizer/g/Setono/post-nord-php-sdk.svg?style=flat-square
+[ico-github-actions]: https://github.com/Setono/post-nord-php-sdk/workflows/build/badge.svg
+[ico-code-quality]: https://img.shields.io/scrutinizer/g/Setono/post-nord-php-sdk.svg
 
 [link-packagist]: https://packagist.org/packages/setono/post-nord-php-sdk
-[link-travis]: https://travis-ci.com/Setono/post-nord-php-sdk
+[link-github-actions]: https://github.com/Setono/post-nord-php-sdk/actions
 [link-code-quality]: https://scrutinizer-ci.com/g/Setono/post-nord-php-sdk

README.md

@@ -14,17 +14,19 @@
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
-        "thecodingmachine/safe": "^0.1.15"
+        "thecodingmachine/safe": "^1.0"
     },
     "require-dev": {
+        "ergebnis/composer-normalize": "^2.0",
+        "korbeil/phpstan-generic-rules": "^0.2",
         "kriswallsmith/buzz": "^1.0",
-        "localheinz/composer-normalize": "^1.1",
         "nyholm/psr7": "^1.1",
-        "phpspec/phpspec": "^5.1",
-        "phpstan/phpstan": "^0.10.3",
+        "phpspec/phpspec": "^5.1 || ^6.0",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-strict-rules": "^0.12",
         "phpunit/phpunit": "^8.0",
-        "symplify/easy-coding-standard": "^5.1",
-        "thecodingmachine/phpstan-safe-rule": "^0.1.3"
+        "sylius-labs/coding-standard": "^3.1",
+        "thecodingmachine/phpstan-safe-rule": "^1.0beta"
     },
     "config": {
         "sort-packages": true
@@ -41,12 +43,14 @@
     },
     "prefer-stable": true,
     "scripts": {
-        "analyse": "./vendor/bin/phpstan analyse -c phpstan.neon -l max src",
-        "check-style": "./vendor/bin/ecs check --ansi src/ tests/ spec/",
-        "fix-style": "./vendor/bin/ecs check --fix --ansi src/ tests/ spec/",
+        "analyse": "vendor/bin/phpstan analyse -c phpstan.neon -l max src",
+        "check-style": "vendor/bin/ecs check --ansi src/ tests/ spec/",
+        "fix-style": "vendor/bin/ecs check --fix --ansi src/ tests/ spec/",
+        "phpspec": "vendor/bin/phpspec run",
+        "phpunit": "vendor/bin/phpunit",
         "test": [
-            "./vendor/bin/phpspec run",
-            "./vendor/bin/phpunit"
+            "@phpspec",
+            "@phpunit"
         ]
     }
 }

composer.json

@@ -1,6 +1,2 @@
 imports:
-    - { resource: 'vendor/symplify/easy-coding-standard/config/symfony.yml' }
-
-services:
-    PhpCsFixer\Fixer\Import\OrderedImportsFixer: ~
-    PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer: ~
+    - { resource: 'vendor/sylius-labs/coding-standard/easy-coding-standard.yml' }

easy-coding-standard.yaml

@@ -1,7 +1,10 @@
 includes:
-    - vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
+	- vendor/korbeil/phpstan-generic-rules/extension.neon
+	- vendor/phpstan/phpstan-strict-rules/rules.neon
+	- vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
 
 parameters:
-    excludes_analyse:
-        # Test dependencies
-        - 'tests/**.php'
+	checkMissingIterableValueType: false
+
+	excludes_analyse:
+		- 'tests/**.php'

phpstan.neon

@@ -18,6 +18,7 @@
 class ClientSpec extends ObjectBehavior
 {
     private const API_KEY = 'api_key';
+
     private const BASE_URL = 'https://api2.postnord.com';
 
     public function let(
@@ -45,7 +46,7 @@ public function it_gets(
         StreamInterface $stream
     ): void {
         $requestFactory
-            ->createRequest('GET', self::BASE_URL.'/endpoint.json?apikey='.self::API_KEY.'&param1=value1&param2=value2')
+            ->createRequest('GET', self::BASE_URL . '/endpoint.json?apikey=' . self::API_KEY . '&param1=value1&param2=value2')
             ->shouldBeCalled();
 
         $response->getStatusCode()->willReturn(200);
@@ -72,7 +73,7 @@ public function it_posts(
         $request->withBody(Argument::any())->willReturn($request);
 
         $requestFactory
-            ->createRequest('POST', self::BASE_URL.'/endpoint.json?apikey='.self::API_KEY.'&param1=value1&param2=value2')
+            ->createRequest('POST', self::BASE_URL . '/endpoint.json?apikey=' . self::API_KEY . '&param1=value1&param2=value2')
             ->willReturn($request);
 
         $streamFactory

spec/Client/ClientSpec.php

@@ -4,6 +4,7 @@
 
 namespace Setono\PostNord\Client;
 
+use const PHP_QUERY_RFC3986;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface as HttpClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
@@ -16,29 +17,19 @@
 
 final class Client implements ClientInterface
 {
-    /**
-     * @var HttpClientInterface
-     */
+    /** @var HttpClientInterface */
     private $httpClient;
 
-    /**
-     * @var RequestFactoryInterface
-     */
+    /** @var RequestFactoryInterface */
     private $requestFactory;
 
-    /**
-     * @var StreamFactoryInterface
-     */
+    /** @var StreamFactoryInterface */
     private $streamFactory;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $apiKey;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $baseUrl;
 
     public function __construct(
@@ -56,11 +47,6 @@ public function __construct(
     }
 
     /**
-     * @param string $endpoint
-     * @param array  $params
-     *
-     * @return array
-     *
      * @throws ClientExceptionInterface
      * @throws JsonException
      * @throws StringsException
@@ -71,12 +57,6 @@ public function get(string $endpoint, array $params = []): array
     }
 
     /**
-     * @param string $endpoint
-     * @param array  $params
-     * @param array  $body
-     *
-     * @return array
-     *
      * @throws ClientExceptionInterface
      * @throws JsonException
      * @throws StringsException
@@ -87,13 +67,6 @@ public function post(string $endpoint, array $params = [], array $body = []): ar
     }
 
     /**
-     * @param string $method
-     * @param string $endpoint
-     * @param array  $params
-     * @param array  $body
-     *
-     * @return array
-     *
      * @throws ClientExceptionInterface
      * @throws JsonException
      * @throws StringsException
@@ -104,11 +77,11 @@ private function sendRequest(string $method, string $endpoint, array $params = [
             'apikey' => $this->apiKey,
         ], $params);
 
-        $url = $this->baseUrl.'/'.$endpoint.'?'.http_build_query($params, '', '&', PHP_QUERY_RFC3986);
+        $url = $this->baseUrl . '/' . $endpoint . '?' . http_build_query($params, '', '&', PHP_QUERY_RFC3986);
 
         $request = $this->requestFactory->createRequest($method, $url);
 
-        if (!empty($body)) {
+        if (count($body) > 0) {
             $request = $request->withBody($this->streamFactory->createStream(json_encode($body)));
         }
 

src/Client/Client.php

@@ -8,22 +8,11 @@ interface ClientInterface
 {
     /**
      * Sends a GET request to the specified endpoint with the given query params.
-     *
-     * @param string $endpoint
-     * @param array  $params
-     *
-     * @return array
      */
     public function get(string $endpoint, array $params = []): array;
 
     /**
      * Sends a POST request to the specified endpoint with the given query params and specified body.
-     *
-     * @param string $endpoint
-     * @param array  $params
-     * @param array  $body
-     *
-     * @return array
      */
     public function post(string $endpoint, array $params = [], array $body = []): array;
 }